Simplify unique_ptr instantiation. No functionality change.