Wrap globals in macros