avtools: remove the distinction between func_arg and func2_arg.