Implemented Choice.ofOptionWith, Choice.compose/composeBack.
Added a TODO item about making adjustments to some methods in ChoiceBuilder.