remove qexpr from 'or' and 'and' functions

Summary:
Adding the true and false clauses to these two functions actually
created undesired behavior. Those clauses should be a part of an if
statement only. This allows for the following (combining and's and
or's):

(if (and (== 0 x) (== 0 y) (or (> z y) (> z x))) {t} {f})