Various improvements of diffs.