Remove spurious semicolons from macros; their upset compilers that don't like