translate macro return type from ExprOf to Expr as well (really closes #1804)

subj