A number of formatting changes.

Most of these were caught by python-mode[1], and there are more to
come.

[1]: https://github.com/klen/python-mode