Add more simplifications
Fix up checking identicality