dict.update() + minor cosmetics

:-). I probably shouldn't have put all these in the same commit, but I'm editing on GitHub and that's fastest.