Add option-groups capability to Choices.