pre2.3.0 change 130: bug-fix in the short-circuiting of non-boolean expressions.