A handful of independant, hopefully non-contraversial changes.

See the individual commits for details; these didn't seem worth individual pull requests.