Unify more things!

If two solutions arrive at more or less the same time (e.g. part of the
same application) but are not identical, we need to unify them before
propagating solutions.