Fix some issues with iterator macros

in particular, handle situations where Symbols are passed
rather then Exprs.