Don't let subclasses be choice types
Fix serialization of non-array choices types