fix a number of desugaring errors related to andExpr and orExpr