Added some paranoid std::move's