Docstring correction
I don't even know when these were message types
Remove some big unhelpful comment blocks
Merge pull request #7095 from takluyver/misc-fixing-stuff

Misc cleanup