Flake8 fixes -- including not runnign flake8 over a backported file