use less CPP macros
clear TypedExpr, as well