Support editing 'choice' udfs. Fixes #285.