Updated to support pyflake.