Fix spurious flake8 warnings about unused import.
Fix flake8 space warning.