Improve comments

I cut-and-paste entirely too many comments in my code, and sometimes
comments from unrelated functions end up copied to new places.  :)
Oops!