cli, options: simplify special case handling, pass unknown flags to caller/opt.additional_args

cli, options: simplify special case handling, pass unknown flags to caller/opt.additional_args #447