More pyflakes fixups.