Some pyflakes cleanup.