Splitup of IfThenElse to IfThen and IfThenElse