Source cleanup (mostly lint), one missing rename.

This mostly cleans up a few lint errors, normalizes some formatting and import
order, etc. I'm not yet attempting to make things lint clean, just making some
progress.

I also fixed one error with a `simplejson` call that didn't get renamed.