fixing "comment in string" annoyances.