Misc comment typo fixes.

Backpatch the applicable parts, just to make backpatching future patches
easier.