Ensure proper sorting of 'choices' attribute on ChoiceField