[Form] WIP ChoiceList refactoring