Fix some flake8 nits.