Fix some flake8 wrapping warnings