Clean up std::forward to match spelling of argument type (#5608) This helps readability and also avoids false positives during static analysis.