Updated for changes to macros requiring semicolons.