Correctly handle double quotes in comments (see #7102)