Push the argument resolving back into the macro.
Since:
* we need the __ENV__ to give correct line numbers.
* I suspect this will help with scoping