Tweak display when choice text is missing.
Merge.