Clarify semantics of SetDiscriminant
and change enum deaggregation to match those semantics
#94590
+515
−444