Handle when option argument looks like option.

Example: foo-bar
Merge branch 'option-argument-looking-like-option'