Modify to work with pep8 1.5.x