Cheap re-indentation using reindent.py from python-2.7.13.
This costs nothing and will avoid PEP8 complaints about tabs in CI.