Remap ZZ in diffs