More tweaks to use equality over the eq methods