If you do pep8 cleanups, commit this change separately.