Merge "More debug malloc fixes."