This patch series just does a bunch of cleanup to the imagefactory, found
by code inspection and through the use of pylint. There should be no
functional change after this series, just cleaner code. With these patches in
place tests still pass and a local upload style build still succeeds. Please
review and ACK.
Chris Lalancette