Adding improved support for nargs.