Delete Fun, the Fun/Var split wasn't that helpful
Add methods for equivalentOn and idempotent to Util
Use the nice idempotent method in simplify
Change to using equivalent