Ands and Ors in the input program should be short circuited in Orb

[ravimad]

And and Ors should be be converted to IfThenElse even before the instrumentation phase. Now, it happens later.