Diff: change equals/hashCode/toString slightly

Don't try and .equals() the paired diff, it leads to infinite recursion...