Don't allow nontext UDF choice values, and change all existing ones to text

Fixes #950