better output of type diffs
treat functions like objects in equiv (removes warnings about passing functions as objects); better output of type diff
undoing change in how functions are merged (to be revised...)