Fix equals() on the new data structures.