Minor comment and string fixes.

Small tweaks, partly caused by comments on PRs #669, #690.