Choice and expression-if

now we have chosenBy : string*int -> boolE
and         ifExpr : boolE * 'a exp * 'a exp -> 'a exp

chosenBy is used in vanillaFx options.
The contract If is still there, so the constructor for expression-if
in ContractBase is "Iff".