Allocator.* became memory.*, tidying up