Two std::move fixes.