Cleanup

Daniel Kahn Gillmorrequested to merge
cleanup into master

This contains a series of minor cleanup edits, none of which contain anything substantive.

Merge request reports