Clean up a bit, and hopefully make update_all a lot faster

Testing done: none yet.