replace enum/choice_option pair with choice_option subclass