Clean up and partial fix for strange linker bug in Allocator.