More pyflakes fixups.
Merge pull request #43 from bukzor/more_pyflakes_fixups

More pyflakes fixups.