Fix incorrect call to choiceSucceeds in ChoiceTaskEvaluator.
Cleanup.