Put back Arg creation because it was breaking SUPER support.