Merge "Remove spurious std::move()." into main