Some cleanup.
Expressions in single line comments.