(#1873) - Split out argsarray into its own module