Fix parsing of "-" in OptionParser

Closes #2302.