notZeroExpr (in the parser) has become createCondExpr (in the resolver). A small part of this, with expressions, had been done previously.