Added groundwork for text-annotated Choice items.