Improve English in comments

A squashed down version of #606.