Fix style issues caught by pep8 1.5.7.