Changed the desugarer to generated 1..1 cardinalities for enum's rather than empty