Clean up PyFlakes warnings in 1.7.
Review Request #5579 — Created March 3, 2014 and submitted
In order to keep things clean, I've gone through the PyFlakes warnings
found in 1.7 and fixed them up. These fixes match the fixes done in
2.0, and shouldn't be too painful to merge.
Unit tests pass.
PyFlakes is happy.
