Update all macros to take 2 arguments (args, kvargs)