Hm, I though I could save a few bits as the context of that function is tiny compared to other contexts.
But, again, if you like the long version more, I'll change that.