Fix a case where UnswitchTrivialCondition broke critical edges with