Add smarter ChoiceType coercion, fixes #60