I don't want to make this kind of change: it adds code and indirection, and I'm trying to ruthlessly minimize both of those things.