revert: use the OPT_CMDMODE for parsing, reducing code