More KNF.
Remove MemCheck_{on,off} that escaped last time around.
Wrap some long lines.