wrap all the other module allocations as well, change the MODULE_ALLOC macro to 2: begin/end