more desugaring fixes to andExpr and orExpr