Drop a couple of useless std::move().