Fix for compiler warning

Rearranging the macro contents makes those semicolons after the macro
non-redundant