Random pep8 fixes

To prepare for bumping the version of hacking in a later branch, fix
up a few trivial issues that it will complain about and fail on.

Change-Id: I19cc3aee0edfd25e198afd7797e9c483ce1b201e
3 files changed