revert modifications to parse-options, due to the existence of the undocumented flag --