The comments now live in the surrounding location, not inside the Match. Make sure we keep them. Closes #24707