Demand code porting - update of destination/mode choice to new choice_model interface