Change a couple of HashMap value types from OwnPtr to std::unique_ptr