First cut at repairing out-of-date comments; make alignment of macro defs

all the same within the #ifdef WITH_PYMALLOC block.