Fix Diff's common start / end detection