Updates to the update-images.py script and utilities

I prefer not to record TODOs in code.