More pep8-related conflicts