- Fix substitution of universes which needlessly hashconsed existing universes.
- More cleanup. remove unneeded functions in universes