Fixed order of simplifications (#6029)