Nitpicking, mostly.

This is a trivial comments-only patch.  If you want to correct / ignore me on 056a071 you can have the other two commits individually, of course.

thanks-