Merge "Fix mismatched new[]/delete."