Draft: Replace do { ... } while(0) with { ... } syntax

Replace the outdated do { ... } while(0) with normal { ... } syntax which is supported by all normal compilers.