added support for @ARGP and @ARGT (no __args anymore)