Conform to stricter rules in newer pep8.