Since ReviewBot has been slacking off, a bunch of issues have slipped in (plus

there are a lot that we just never fixed up). This change fixes almost

everything, with the exception that a few things PEP-8 thinks are problems are

actually preferred.

Ran unit tests.