Fix handling of end of command options (`--`) in `OptionParser`