Better sorting to avoid noisy diffs in future