Rename func.arg_opts to func.opts_by_arg, provide func.opts_by_common