Fixed the functions in ChoiceCont so they work correctly (they were returning Choice instead of ChoiceContFunc).
Added type annotations to some functions to make them easier to understand and also to enforce some type constraints.