make the MAKME macro a little less evil (to my taste at least :-))

also swap parameters to calloc to match the specification