PyFlakes fixes for #31