Fix a bunch of pyflakes warnings.
Review Request #5733 — Created April 23, 2014 and submitted
Fix up things that have snuck in over the past few months.
Ran unit tests.
Review Request #5733 — Created April 23, 2014 and submitted
Fix up things that have snuck in over the past few months.
Ran unit tests.