Make choice titles use rich content.

Fixes #1