Update to diff-lcs 1.2.3 and remove workarounds.

This also corrects the previous diff's back the way they were and fixes