Convert macros back to dynamic scoping.
Merge pull request #10 from huonw/dynamic-macros

Convert macros back to dynamic scoping.