More fixes: universe handling and avoid structural equality, all the test-suite goes
through now.