Make ARGUMENT_OPTIONAL flags a bit smarter
We should teach our flags that other flags are unlikely to be their arguments. Fortunately, none of our current ARGUMENT_OPTIONAL values currently take any arguments starting with -.
Related to #40204 (closed).