Further simplification of ms_allocator