More pyflakes fixes