Switch to scoped_ptr/swap pattern