Rework due to simplifications in malloc.c output.