Remove extra ';' outside of function macros