Lots of changes to how Equivalency works.