Reapply pep8 changes from previous revert.