Merge "Make allocations use unique_ptr."