Yeah; I want to do other rearranging in `objects.py`, but I'll do that in a separate commit.