881bb2295d
Taking them by const reference isn't advisable here, because it means the std::move calls were doing nothing and we were always copying the std::string instances.