TextControl: allow custom ChoiceControl