Merge pull request #20714 from A4-Tacks/rm-dbg-trailing-comma

Fix not applicable on trailing comma for remove_dbg