Updated for language changes to macros.