Merge "Move a shared pointer that's going to die anyway."