We have custom model impl classes now, so enumeration values can be typed by...

We have custom model impl classes now, so enumeration values can be typed by the model without derived state (which messed up serialization).