More improvements to the 3-way merge algorithm.