translate macro return type from ExprOf to Expr as well (really closes #1804)
Merge pull request #2347 from nadako/1804_macro_return_exprof

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