Do a little doc cleanup.

(This is on top of my previous pull request, so ignore the repeated parts and
I'll cleanup before you merge.)