Tidy up comments.

[originally from svn r6601]