Fix for macros requiring semi-colons