Remove some unnecessary use of shared_ptr.