Rearrange for slightly better diffs