replace ExprOf<T> by Expr in macros (close #1804)