Stylistic change only (added "do { ... } while( 0 )" around multi-statement macros)