Update to args handling to allow the ARGS=args.ARGS magic to work