jack: Do not include multiple statements in macros without surrounding them with a do ... while.  Found by Coverity.