Some pyflake fixes.