Fixing styleguide issues as reported by flake8.