Clean up nicer allocator a bit more.