Neatened up the internal use of Args.