Convert macros back to dynamic scoping.

r? @bjz