I don't know if anything else was relying on the old behavior, this seems more correct.
Fixes #16348
If '-F' is allowed to have an optional argument, with the previous version '-FF' would be translated to '-F -F'. In this new version '-FF' translates to '-F' with argument 'F'