Unrelated changes (but probably good for a different PR). Same thing applies to diff of zoomy.py.