Misc fixes.

- Do not try to comment if no comment is actually there.
- Better handling of utf-8 characters.