This started as an attempt to allow use without the two-step allocator.
While I never implemented the latter, this seems like a nice refactoring
in its own right.