Revised unification rule ordering and bugfix for occurs check on delayed types