added more arity macros