Updated for language changes to macros.

After a nightly, the library stopped building due to macro changes. This fixes that.