Improvements and simplifications to the equality seek logic. Tests are

adjusted so that they all pass now.

FossilOrigin-Name: 997ce6c90b454c03cc2ef6934752ee8dd2e520e3