fix more pyflakes discovered by pyflakes-0.8.1