Remove carriage return from comments (#738)

Something changed in the way we print comments and the carriage return
(\r) was getting included in the output. They shouldn't be in the input
anymore either, so this commit removes them.

The baselines are already normalised so don't show any changes.

Author: sandersn