Style cleanups after r285270
There should be no semicolons in added macro definitions. Define empty macro as "do {} while (0)".
Pointed out by: jmg