[ChoiceBox] little code cleanup.