Flake8ify #2231