Not a big deal, but there are malloc/realloc wrappers in util.h. I'll change the code after merging.