Add a 'Choice' field on elements

[janettework]

Instead of setting all elements within a choice to optional, preserve the ordering of elements within a choice element by adding a new Choice field on elements. For elements within sequences within the choice, they belong in the same choice ordering.