Properly handle parsing choices from UDAs.
Merge pull request #62 from coddingtonbear/fix_choices_handling_udas

Properly handle parsing choices from UDAs.