Added fixes/support for comments.

Comment parsing wasn't happy, so that's patched. And single line C-style
comments hadn't been added to the parser.