Further pep8 penance