Get rid of boost::scoped_ptr