Before getting rid of unify and trying to speed up fix_dom.
Right up against the dragon now...