Got rid of std::unique_ptr.