Making the license fetishists happy.
Adding the form of -r1, which will result in -r 1 in arg.h.
Adding the missing arg.h for ARG* macros.