Before Related constraints optimisation
Before Related constraints optimisations1
Speed improvement

The fast way is made robust so that the 'slow'optimization is not
required any more.