Revert ChoiceSchemaNode.getCases() to return a Collection