Merge "Fix complaints about mismatched new/delete"