Pyflakes import clean

Discovered a missing import, and also did a general Pyflakes import clean.