flake8 fixes

I _really_ don't like this being necessary (vertical alignment makes me sad) but, well...