I believe that the backpatching before the and and or are wrong

tests/sprint3/test/sp3_if_else.alpha

@@ -13,8 +13,8 @@ bar (r,s) := {
 
 entry (arg) := {
  	[ integer: r ; integer: s; Boolean: x]
-        x := (r < s) & x;
-        if ( r < s ) then {
+        (* x := (r < s) & x; *)
+        if ( ( r < s ) & (s = r) ) then {
                 r := 5;
         } else {
                 r := 7;