r20110: Fix interaction between paranoid malloc checker