redo how options are parsed.