When a field has choices, display the verbose version.

Fixes the second point of #8.