diff --git a/test/cfg/generated-cfg-tests-avr.cpp b/test/cfg/generated-cfg-tests-avr.cpp
index 89d918714..8d4b5392b 100644
--- a/test/cfg/generated-cfg-tests-avr.cpp
+++ b/test/cfg/generated-cfg-tests-avr.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/avr.cfg > generated-cfg-tests-avr.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-avr.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-avr.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__toascii__noreturn() {
-  int x = 100;
-  if (cond) x=1; else toascii(arg1);
+  int x = 1;
+  if (cond) { x=100; toascii(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22,8 +22,8 @@ void test__toascii__leakignore() {
 }
 
 void test__vfprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfprintf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vfprintf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -46,8 +46,8 @@ void test__vfprintf_P__arg1__notuninit() {
 }
 
 void test__printf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else printf_P(arg1);
+  int x = 1;
+  if (cond) { x=100; printf_P(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -59,8 +59,8 @@ void test__printf_P__leakignore() {
 }
 
 void test__sprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sprintf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sprintf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -72,8 +72,8 @@ void test__sprintf_P__leakignore() {
 }
 
 void test__snprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else snprintf_P(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; snprintf_P(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -85,8 +85,8 @@ void test__snprintf_P__leakignore() {
 }
 
 void test__vsprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsprintf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vsprintf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -98,8 +98,8 @@ void test__vsprintf_P__leakignore() {
 }
 
 void test__vsnprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsnprintf_P(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vsnprintf_P(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -111,8 +111,8 @@ void test__vsnprintf_P__leakignore() {
 }
 
 void test__fprintf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fprintf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fprintf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -135,8 +135,8 @@ void test__fprintf_P__arg1__notuninit() {
 }
 
 void test__fputs_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fputs_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fputs_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -170,8 +170,8 @@ void test__fputs_P__arg2__notuninit() {
 }
 
 void test__puts_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else puts_P(arg1);
+  int x = 1;
+  if (cond) { x=100; puts_P(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -199,8 +199,8 @@ void test__puts_P__arg1__notuninit() {
 }
 
 void test__scanf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else scanf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; scanf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -218,8 +218,8 @@ void test__scanf_P__arg1__notuninit() {
 }
 
 void test__fscanf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fscanf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fscanf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -237,8 +237,8 @@ void test__fscanf_P__arg1__notuninit() {
 }
 
 void test__sscanf_P__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sscanf_P(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sscanf_P(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -250,8 +250,8 @@ void test__sscanf_P__leakignore() {
 }
 
 void test__fdevopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fdevopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fdevopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -279,8 +279,8 @@ void test__fdevopen__arg2__notuninit() {
 }
 
 void test__ltoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ltoa(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; ltoa(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -320,8 +320,8 @@ void test__ltoa__arg3__notuninit() {
 }
 
 void test__utoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else utoa(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; utoa(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -361,8 +361,8 @@ void test__utoa__arg3__notuninit() {
 }
 
 void test__ultoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ultoa(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; ultoa(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -402,8 +402,8 @@ void test__ultoa__arg3__notuninit() {
 }
 
 void test__random__noreturn() {
-  int x = 100;
-  if (cond) x=1; else random();
+  int x = 1;
+  if (cond) { x=100; random(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -415,8 +415,8 @@ void test__random__leakignore() {
 }
 
 void test__random_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else random_r(arg1);
+  int x = 1;
+  if (cond) { x=100; random_r(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -433,8 +433,8 @@ void test__random_r__arg1__notnull() {
 }
 
 void test__srandom__noreturn() {
-  int x = 100;
-  if (cond) x=1; else srandom(arg1);
+  int x = 1;
+  if (cond) { x=100; srandom(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -452,8 +452,8 @@ void test__srandom__arg1__notuninit() {
 }
 
 void test__dtostre__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dtostre(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; dtostre(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -476,8 +476,8 @@ void test__dtostre__arg2__notnull() {
 }
 
 void test__dtostrf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dtostrf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; dtostrf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -512,8 +512,8 @@ void test__dtostrf__arg4__notnull() {
 }
 
 void test__ffs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ffs(arg1);
+  int x = 1;
+  if (cond) { x=100; ffs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -531,8 +531,8 @@ void test__ffs__arg1__notuninit() {
 }
 
 void test__ffsl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ffsl(arg1);
+  int x = 1;
+  if (cond) { x=100; ffsl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -550,8 +550,8 @@ void test__ffsl__arg1__notuninit() {
 }
 
 void test__ffsll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ffsll(arg1);
+  int x = 1;
+  if (cond) { x=100; ffsll(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -569,8 +569,8 @@ void test__ffsll__arg1__notuninit() {
 }
 
 void test__memccpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memccpy(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; memccpy(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-bsd.cpp b/test/cfg/generated-cfg-tests-bsd.cpp
index 053055e50..029cc4bec 100644
--- a/test/cfg/generated-cfg-tests-bsd.cpp
+++ b/test/cfg/generated-cfg-tests-bsd.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/bsd.cfg > generated-cfg-tests-bsd.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-bsd.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-bsd.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__fts_open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_open(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fts_open(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -39,8 +39,8 @@ void test__fts_open__arg3__notuninit() {
 }
 
 void test__fts_read__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_read(arg1);
+  int x = 1;
+  if (cond) { x=100; fts_read(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -57,8 +57,8 @@ void test__fts_read__arg1__notuninit() {
 }
 
 void test__readpassphrase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readpassphrase(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; readpassphrase(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -76,8 +76,8 @@ void test__readpassphrase__arg2__notuninit() {
 }
 
 void test__fts_set__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_set(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fts_set(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -101,8 +101,8 @@ void test__fts_set__arg3__notuninit() {
 }
 
 void test__fts_set_clientptr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_set_clientptr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fts_set_clientptr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -120,8 +120,8 @@ void test__fts_set_clientptr__arg2__notuninit() {
 }
 
 void test__fts_get_clientptr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_get_clientptr(arg1);
+  int x = 1;
+  if (cond) { x=100; fts_get_clientptr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -133,8 +133,8 @@ void test__fts_get_clientptr__arg1__notuninit() {
 }
 
 void test__fts_get_stream__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_get_stream(arg1);
+  int x = 1;
+  if (cond) { x=100; fts_get_stream(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -146,8 +146,8 @@ void test__fts_get_stream__arg1__notuninit() {
 }
 
 void test__fts_close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fts_close(arg1);
+  int x = 1;
+  if (cond) { x=100; fts_close(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -159,8 +159,8 @@ void test__fts_close__arg1__notuninit() {
 }
 
 void test__readpassphrase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readpassphrase(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; readpassphrase(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -200,8 +200,8 @@ void test__readpassphrase__arg4__notuninit() {
 }
 
 void test__setfib__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setfib(arg1);
+  int x = 1;
+  if (cond) { x=100; setfib(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -213,8 +213,8 @@ void test__setfib__arg1__notuninit() {
 }
 
 void test__strtonum__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtonum(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; strtonum(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-gnu.cpp b/test/cfg/generated-cfg-tests-gnu.cpp
index 510ce52ff..1e932e34c 100644
--- a/test/cfg/generated-cfg-tests-gnu.cpp
+++ b/test/cfg/generated-cfg-tests-gnu.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/gnu.cfg > generated-cfg-tests-gnu.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-gnu.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-gnu.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__accept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else accept(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; accept(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -51,8 +51,8 @@ void test__accept__arg4__notuninit() {
 }
 
 void test__atoq__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atoq(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atoq(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -74,8 +74,8 @@ void test__atoq__arg1__notuninit() {
 }
 
 void test__strndupa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strndupa(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strndupa(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -103,8 +103,8 @@ void test__strndupa__arg2__notuninit() {
 }
 
 void test__strsep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strsep(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strsep(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -132,8 +132,8 @@ void test__strsep__arg2__notuninit() {
 }
 
 void test__strdupa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strdupa(arg1);
+  int x = 1;
+  if (cond) { x=100; result = strdupa(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -155,8 +155,8 @@ void test__strdupa__arg1__notuninit() {
 }
 
 void test__backtrace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else backtrace(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; backtrace(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -173,8 +173,8 @@ void test__backtrace__arg2__notuninit() {
 }
 
 void test__backtrace_symbols__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = backtrace_symbols(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = backtrace_symbols(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -202,8 +202,8 @@ void test__backtrace_symbols__arg2__notuninit() {
 }
 
 void test__backtrace_symbols_fd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else backtrace_symbols_fd(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; backtrace_symbols_fd(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -232,8 +232,8 @@ void test__backtrace_symbols_fd__arg3__notuninit() {
 }
 
 void test__ecvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ecvt(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; ecvt(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -261,8 +261,8 @@ void test__ecvt__arg4__notnull() {
 }
 
 void test__qfcvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else qfcvt(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; qfcvt(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -290,8 +290,8 @@ void test__qfcvt__arg4__notnull() {
 }
 
 void test__qgcvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else qgcvt(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; qgcvt(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -314,8 +314,8 @@ void test__qgcvt__arg3__notnull() {
 }
 
 void test__ecvt_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ecvt_r(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; ecvt_r(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -359,8 +359,8 @@ void test__ecvt_r__arg6__notuninit() {
 }
 
 void test__fcvt_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fcvt_r(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; fcvt_r(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -404,8 +404,8 @@ void test__fcvt_r__arg6__notuninit() {
 }
 
 void test__qecvt_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else qecvt_r(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; qecvt_r(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -449,8 +449,8 @@ void test__qecvt_r__arg6__notuninit() {
 }
 
 void test__qfcvt_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else qfcvt_r(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; qfcvt_r(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -494,8 +494,8 @@ void test__qfcvt_r__arg6__notuninit() {
 }
 
 void test__strcasestr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strcasestr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strcasestr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -539,8 +539,8 @@ void test__strcasestr__arg2__notuninit() {
 }
 
 void test__getresuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getresuid(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getresuid(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -572,8 +572,8 @@ void test__getresuid__arg3__notnull() {
 }
 
 void test__getresgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getresgid(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getresgid(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -605,8 +605,8 @@ void test__getresgid__arg3__notnull() {
 }
 
 void test__setresuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setresuid(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; setresuid(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -636,8 +636,8 @@ void test__setresuid__arg3__notuninit() {
 }
 
 void test__setresgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setresgid(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; setresgid(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -667,8 +667,8 @@ void test__setresgid__arg3__notuninit() {
 }
 
 void test__inet_aton__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_aton(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; inet_aton(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -696,8 +696,8 @@ void test__inet_aton__arg2__notnull() {
 }
 
 void test__inet_addr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_addr(arg1);
+  int x = 1;
+  if (cond) { x=100; inet_addr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -720,8 +720,8 @@ void test__inet_addr__arg1__notuninit() {
 }
 
 void test__inet_network__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_network(arg1);
+  int x = 1;
+  if (cond) { x=100; inet_network(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -744,8 +744,8 @@ void test__inet_network__arg1__notuninit() {
 }
 
 void test__inet_ntoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_ntoa(arg1);
+  int x = 1;
+  if (cond) { x=100; inet_ntoa(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -763,8 +763,8 @@ void test__inet_ntoa__arg1__notuninit() {
 }
 
 void test__inet_makeaddr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_makeaddr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; inet_makeaddr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -788,8 +788,8 @@ void test__inet_makeaddr__arg2__notuninit() {
 }
 
 void test__inet_lnaof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_lnaof(arg1);
+  int x = 1;
+  if (cond) { x=100; inet_lnaof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -807,8 +807,8 @@ void test__inet_lnaof__arg1__notuninit() {
 }
 
 void test__inet_netof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_netof(arg1);
+  int x = 1;
+  if (cond) { x=100; inet_netof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -826,8 +826,8 @@ void test__inet_netof__arg1__notuninit() {
 }
 
 void test__inet_pton__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_pton(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; inet_pton(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -861,8 +861,8 @@ void test__inet_pton__arg3__notnull() {
 }
 
 void test__inet_ntop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else inet_ntop(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; inet_ntop(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -902,8 +902,8 @@ void test__inet_ntop__arg4__notuninit() {
 }
 
 void test__canonicalize_file_name__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = canonicalize_file_name(arg1);
+  int x = 1;
+  if (cond) { x=100; result = canonicalize_file_name(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -925,8 +925,8 @@ void test__canonicalize_file_name__arg1__notnull() {
 }
 
 void test__execvpe__noreturn() {
-  int x = 100;
-  if (cond) x=1; else execvpe(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; execvpe(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -961,8 +961,8 @@ void test__execvpe__arg3__notuninit() {
 }
 
 void test__mkostemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkostemp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mkostemp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -991,8 +991,8 @@ void test__mkostemp__arg2__notuninit() {
 }
 
 void test__mkstemps__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkstemps(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mkstemps(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1021,8 +1021,8 @@ void test__mkstemps__arg2__notuninit() {
 }
 
 void test__mkostemps__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkostemps(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; mkostemps(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1057,8 +1057,8 @@ void test__mkostemps__arg3__notuninit() {
 }
 
 void test__memmem__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = memmem(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = memmem(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1109,8 +1109,8 @@ void test__memmem__arg4__notuninit() {
 }
 
 void test__memrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memrchr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; memrchr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1149,8 +1149,8 @@ void test__memrchr__arg3__notbool() {
 }
 
 void test__rawmemchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rawmemchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; rawmemchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1184,8 +1184,8 @@ void test__rawmemchr__arg2__notuninit() {
 }
 
 void test__ffsl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ffsl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ffsl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1208,8 +1208,8 @@ void test__ffsl__arg1__notuninit() {
 }
 
 void test__ffsll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ffsll(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ffsll(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1232,8 +1232,8 @@ void test__ffsll__arg1__notuninit() {
 }
 
 void test__strchrnul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strchrnul(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strchrnul(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1267,8 +1267,8 @@ void test__strchrnul__arg2__notuninit() {
 }
 
 void test__prlimit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else prlimit(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; prlimit(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1298,8 +1298,8 @@ void test__prlimit__arg3__notuninit() {
 }
 
 void test__epoll_create__noreturn() {
-  int x = 100;
-  if (cond) x=1; else epoll_create(arg1);
+  int x = 1;
+  if (cond) { x=100; epoll_create(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1316,8 +1316,8 @@ void test__epoll_create__arg1__notuninit() {
 }
 
 void test__epoll_create1__noreturn() {
-  int x = 100;
-  if (cond) x=1; else epoll_create1(arg1);
+  int x = 1;
+  if (cond) { x=100; epoll_create1(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1334,8 +1334,8 @@ void test__epoll_create1__arg1__notuninit() {
 }
 
 void test__epoll_ctl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else epoll_ctl(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; epoll_ctl(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1384,8 +1384,8 @@ void test__epoll_ctl__arg4__notnull() {
 }
 
 void test__epoll_wait__noreturn() {
-  int x = 100;
-  if (cond) x=1; else epoll_wait(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; epoll_wait(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1434,8 +1434,8 @@ void test__epoll_wait__arg4__notuninit() {
 }
 
 void test__epoll_pwait__noreturn() {
-  int x = 100;
-  if (cond) x=1; else epoll_pwait(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; epoll_pwait(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-motif.cpp b/test/cfg/generated-cfg-tests-motif.cpp
index 9e4497008..d91bfdbbc 100644
--- a/test/cfg/generated-cfg-tests-motif.cpp
+++ b/test/cfg/generated-cfg-tests-motif.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/motif.cfg > generated-cfg-tests-motif.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-motif.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-motif.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__MrmCloseHierarchy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else MrmCloseHierarchy(arg1);
+  int x = 1;
+  if (cond) { x=100; MrmCloseHierarchy(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22,8 +22,8 @@ void test__MrmCloseHierarchy__arg1__notuninit() {
 }
 
 void test__MrmOpenHierarchy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = MrmOpenHierarchy(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = MrmOpenHierarchy(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -34,8 +34,8 @@ void test__MrmOpenHierarchy__useretval() {
 }
 
 void test__MrmOpenHierarchyPerDisplay__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = MrmOpenHierarchyPerDisplay(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = MrmOpenHierarchyPerDisplay(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -46,8 +46,8 @@ void test__MrmOpenHierarchyPerDisplay__useretval() {
 }
 
 void test__XmFontListEntryFree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XmFontListEntryFree(arg1);
+  int x = 1;
+  if (cond) { x=100; XmFontListEntryFree(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -59,8 +59,8 @@ void test__XmFontListEntryFree__arg1__notuninit() {
 }
 
 void test__XmFontListCreate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XmFontListCreate(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = XmFontListCreate(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -83,8 +83,8 @@ void test__XmFontListCreate__arg2__notuninit() {
 }
 
 void test__XmFontListAppendEntry__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XmFontListAppendEntry(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = XmFontListAppendEntry(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -107,8 +107,8 @@ void test__XmFontListAppendEntry__arg2__notuninit() {
 }
 
 void test__XmStringCreateLocalized__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XmStringCreateLocalized(arg1);
+  int x = 1;
+  if (cond) { x=100; result = XmStringCreateLocalized(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -136,8 +136,8 @@ void test__XmStringCreateLocalized__arg1__notuninit() {
 }
 
 void test__XmStringCreateSimple__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XmStringCreateSimple(arg1);
+  int x = 1;
+  if (cond) { x=100; result = XmStringCreateSimple(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -165,8 +165,8 @@ void test__XmStringCreateSimple__arg1__notuninit() {
 }
 
 void test__XmStringFree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XmStringFree(arg1);
+  int x = 1;
+  if (cond) { x=100; XmStringFree(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -178,8 +178,8 @@ void test__XmStringFree__arg1__notuninit() {
 }
 
 void test__XmStringGenerate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XmStringGenerate(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; XmStringGenerate(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -191,8 +191,8 @@ void test__XmStringGenerate__leakignore() {
 }
 
 void test__XmTextGetString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XmTextGetString(arg1);
+  int x = 1;
+  if (cond) { x=100; XmTextGetString(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -210,8 +210,8 @@ void test__XmTextGetString__arg1__notuninit() {
 }
 
 void test__XmTextGetStringWcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XmTextGetStringWcs(arg1);
+  int x = 1;
+  if (cond) { x=100; XmTextGetStringWcs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -240,8 +240,8 @@ void test__XtAsprintf__arg2__notuninit() {
 }
 
 void test__XtFree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtFree(arg1);
+  int x = 1;
+  if (cond) { x=100; XtFree(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -253,8 +253,8 @@ void test__XtFree__arg1__notuninit() {
 }
 
 void test__XtSetValues__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtSetValues(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; XtSetValues(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -266,8 +266,8 @@ void test__XtSetValues__leakignore() {
 }
 
 void test__XtGetValues__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtGetValues(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; XtGetValues(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -279,8 +279,8 @@ void test__XtGetValues__leakignore() {
 }
 
 void test__XtSetSubvalues__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtSetSubvalues(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; XtSetSubvalues(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -292,8 +292,8 @@ void test__XtSetSubvalues__leakignore() {
 }
 
 void test__XtGetSubvalues__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtGetSubvalues(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; XtGetSubvalues(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -305,8 +305,8 @@ void test__XtGetSubvalues__leakignore() {
 }
 
 void test__XtMalloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XtMalloc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = XtMalloc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -323,8 +323,8 @@ void test__XtMalloc__arg1__notuninit() {
 }
 
 void test__XtNew__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XtNew(arg1);
+  int x = 1;
+  if (cond) { x=100; result = XtNew(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -341,8 +341,8 @@ void test__XtNew__arg1__notuninit() {
 }
 
 void test__XtNewString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XtNewString(arg1);
+  int x = 1;
+  if (cond) { x=100; result = XtNewString(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -359,8 +359,8 @@ void test__XtNewString__arg1__notuninit() {
 }
 
 void test__XtCalloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = XtCalloc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = XtCalloc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -383,8 +383,8 @@ void test__XtCalloc__arg2__notuninit() {
 }
 
 void test__XOpenDisplay__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XOpenDisplay(arg1);
+  int x = 1;
+  if (cond) { x=100; XOpenDisplay(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -402,8 +402,8 @@ void test__XOpenDisplay__arg1__notuninit() {
 }
 
 void test__XCloseDisplay__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XCloseDisplay(arg1);
+  int x = 1;
+  if (cond) { x=100; XCloseDisplay(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -421,8 +421,8 @@ void test__XCloseDisplay__arg1__notuninit() {
 }
 
 void test__XtDatabase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtDatabase(arg1);
+  int x = 1;
+  if (cond) { x=100; XtDatabase(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -440,8 +440,8 @@ void test__XtDatabase__arg1__notuninit() {
 }
 
 void test__XtScreenDatabase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else XtScreenDatabase(arg1);
+  int x = 1;
+  if (cond) { x=100; XtScreenDatabase(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-posix.cpp b/test/cfg/generated-cfg-tests-posix.cpp
index 29d52875c..aa4fd9a1a 100644
--- a/test/cfg/generated-cfg-tests-posix.cpp
+++ b/test/cfg/generated-cfg-tests-posix.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/posix.cfg > generated-cfg-tests-posix.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-posix.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-posix.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__a64l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = a64l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = a64l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -38,8 +38,8 @@ void test__a64l__arg1__notuninit() {
 }
 
 void test__l64a__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = l64a(arg1);
+  int x = 1;
+  if (cond) { x=100; result = l64a(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -62,8 +62,8 @@ void test__l64a__arg1__notuninit() {
 }
 
 void test__accept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else accept(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; accept(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -93,8 +93,8 @@ void test__accept__arg3__notuninit() {
 }
 
 void test__access__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = access(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = access(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -128,8 +128,8 @@ void test__access__arg2__notuninit() {
 }
 
 void test__adjtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else adjtime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; adjtime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -147,8 +147,8 @@ void test__adjtime__arg1__notuninit() {
 }
 
 void test__gettimeofday__noreturn() {
-  int x = 100;
-  if (cond) x=1; else gettimeofday(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; gettimeofday(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -160,8 +160,8 @@ void test__gettimeofday__leakignore() {
 }
 
 void test__settimeofday__noreturn() {
-  int x = 100;
-  if (cond) x=1; else settimeofday(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; settimeofday(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -185,8 +185,8 @@ void test__settimeofday__arg2__notuninit() {
 }
 
 void test__FD_CLR__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FD_CLR(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; FD_CLR(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -209,8 +209,8 @@ void test__FD_CLR__arg2__notnull() {
 }
 
 void test__FD_ISSET__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FD_ISSET(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; FD_ISSET(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -233,8 +233,8 @@ void test__FD_ISSET__arg2__notnull() {
 }
 
 void test__FD_SET__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FD_SET(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; FD_SET(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -257,8 +257,8 @@ void test__FD_SET__arg2__notnull() {
 }
 
 void test__FD_ZERO__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FD_ZERO(arg1);
+  int x = 1;
+  if (cond) { x=100; FD_ZERO(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -275,8 +275,8 @@ void test__FD_ZERO__arg1__notnull() {
 }
 
 void test__fdatasync__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fdatasync(arg1);
+  int x = 1;
+  if (cond) { x=100; fdatasync(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -294,8 +294,8 @@ void test__fdatasync__arg1__notuninit() {
 }
 
 void test__fnmatch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fnmatch(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = fnmatch(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -345,8 +345,8 @@ void test__fnmatch__arg3__notuninit() {
 }
 
 void test__fsync__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fsync(arg1);
+  int x = 1;
+  if (cond) { x=100; fsync(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -364,8 +364,8 @@ void test__fsync__arg1__notuninit() {
 }
 
 void test__truncate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else truncate(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; truncate(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -394,8 +394,8 @@ void test__truncate__arg2__notuninit() {
 }
 
 void test__ftruncate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ftruncate(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ftruncate(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -419,8 +419,8 @@ void test__ftruncate__arg2__notuninit() {
 }
 
 void test__flock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else flock(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; flock(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -444,8 +444,8 @@ void test__flock__arg2__notuninit() {
 }
 
 void test__symlink__noreturn() {
-  int x = 100;
-  if (cond) x=1; else symlink(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; symlink(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -479,8 +479,8 @@ void test__symlink__arg2__notuninit() {
 }
 
 void test__open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else open(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; open(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -509,8 +509,8 @@ void test__open__arg3__notuninit() {
 }
 
 void test__creat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = creat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = creat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -538,8 +538,8 @@ void test__creat__arg2__notuninit() {
 }
 
 void test__sleep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sleep(arg1);
+  int x = 1;
+  if (cond) { x=100; sleep(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -562,8 +562,8 @@ void test__sleep__arg1__notuninit() {
 }
 
 void test__usleep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else usleep(arg1);
+  int x = 1;
+  if (cond) { x=100; usleep(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -580,8 +580,8 @@ void test__usleep__arg1__notbool() {
 }
 
 void test___exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _exit(arg1);
+  int x = 1;
+  if (cond) { x=100; _exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -593,8 +593,8 @@ void test___exit__arg1__notuninit() {
 }
 
 void test__faccessat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else faccessat(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; faccessat(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -635,8 +635,8 @@ void test__faccessat__arg4__notuninit() {
 }
 
 void test__acct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else acct(arg1);
+  int x = 1;
+  if (cond) { x=100; acct(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -654,8 +654,8 @@ void test__acct__arg1__notuninit() {
 }
 
 void test__alarm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else alarm(arg1);
+  int x = 1;
+  if (cond) { x=100; alarm(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -673,8 +673,8 @@ void test__alarm__arg1__notuninit() {
 }
 
 void test__getrpcent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getrpcent();
+  int x = 1;
+  if (cond) { x=100; result = getrpcent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -691,8 +691,8 @@ void test__getrpcent__leakignore() {
 }
 
 void test__getrpcbyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getrpcbyname(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getrpcbyname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -720,8 +720,8 @@ void test__getrpcbyname__arg1__notuninit() {
 }
 
 void test__getrpcbynumber__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getrpcbynumber(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getrpcbynumber(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -744,8 +744,8 @@ void test__getrpcbynumber__arg1__notuninit() {
 }
 
 void test__getprotoent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getprotoent();
+  int x = 1;
+  if (cond) { x=100; result = getprotoent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -762,8 +762,8 @@ void test__getprotoent__leakignore() {
 }
 
 void test__getprotobyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getprotobyname(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getprotobyname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -791,8 +791,8 @@ void test__getprotobyname__arg1__notuninit() {
 }
 
 void test__getprotobynumber__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getprotobynumber(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getprotobynumber(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -815,8 +815,8 @@ void test__getprotobynumber__arg1__notuninit() {
 }
 
 void test__getservent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getservent();
+  int x = 1;
+  if (cond) { x=100; result = getservent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -833,8 +833,8 @@ void test__getservent__leakignore() {
 }
 
 void test__getservbyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getservbyname(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = getservbyname(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -868,8 +868,8 @@ void test__getservbyname__arg2__notuninit() {
 }
 
 void test__getservbyport__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getservbyport(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = getservbyport(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -898,8 +898,8 @@ void test__getservbyport__arg2__notuninit() {
 }
 
 void test__getnetent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getnetent();
+  int x = 1;
+  if (cond) { x=100; result = getnetent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -916,8 +916,8 @@ void test__getnetent__leakignore() {
 }
 
 void test__getnetbyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getnetbyname(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getnetbyname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -945,8 +945,8 @@ void test__getnetbyname__arg1__notuninit() {
 }
 
 void test__getnetbyaddr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getnetbyaddr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = getnetbyaddr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -975,8 +975,8 @@ void test__getnetbyaddr__arg2__notuninit() {
 }
 
 void test__gethostent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gethostent();
+  int x = 1;
+  if (cond) { x=100; result = gethostent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -993,8 +993,8 @@ void test__gethostent__leakignore() {
 }
 
 void test__gethostbyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gethostbyname(arg1);
+  int x = 1;
+  if (cond) { x=100; result = gethostbyname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1022,8 +1022,8 @@ void test__gethostbyname__arg1__notuninit() {
 }
 
 void test__gethostbyname2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gethostbyname2(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = gethostbyname2(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1057,8 +1057,8 @@ void test__gethostbyname2__arg2__notuninit() {
 }
 
 void test__gethostbyaddr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gethostbyaddr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = gethostbyaddr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1098,8 +1098,8 @@ void test__gethostbyaddr__arg3__notuninit() {
 }
 
 void test__brk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else brk(arg1);
+  int x = 1;
+  if (cond) { x=100; brk(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1116,8 +1116,8 @@ void test__brk__arg1__notnull() {
 }
 
 void test__sbrk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sbrk(arg1);
+  int x = 1;
+  if (cond) { x=100; sbrk(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1135,8 +1135,8 @@ void test__sbrk__arg1__notuninit() {
 }
 
 void test__closedir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else closedir(arg1);
+  int x = 1;
+  if (cond) { x=100; closedir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1158,8 +1158,8 @@ void test__closedir__arg1__notuninit() {
 }
 
 void test__strfry__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strfry(arg1);
+  int x = 1;
+  if (cond) { x=100; strfry(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1170,8 +1170,8 @@ void test__strfry__arg1__notnull() {
 }
 
 void test__strsep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strsep(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strsep(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1205,8 +1205,8 @@ void test__strsep__arg2__notuninit() {
 }
 
 void test__strdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strdup(arg1);
+  int x = 1;
+  if (cond) { x=100; strdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1223,8 +1223,8 @@ void test__strdup__arg1__notuninit() {
 }
 
 void test__strndup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strndup(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strndup(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1247,8 +1247,8 @@ void test__strndup__arg2__notuninit() {
 }
 
 void test__wcsdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsdup(arg1);
+  int x = 1;
+  if (cond) { x=100; wcsdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1265,8 +1265,8 @@ void test__wcsdup__arg1__notuninit() {
 }
 
 void test__mkstemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkstemp(arg1);
+  int x = 1;
+  if (cond) { x=100; mkstemp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1289,8 +1289,8 @@ void test__mkstemp__arg1__notuninit() {
 }
 
 void test__mkdtemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkdtemp(arg1);
+  int x = 1;
+  if (cond) { x=100; mkdtemp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1313,8 +1313,8 @@ void test__mkdtemp__arg1__notuninit() {
 }
 
 void test__mktemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = mktemp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = mktemp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1342,8 +1342,8 @@ void test__mktemp__arg1__notuninit() {
 }
 
 void test__getcwd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getcwd(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; getcwd(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1367,8 +1367,8 @@ void test__getcwd__arg2__notuninit() {
 }
 
 void test__mkdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkdir(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mkdir(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1397,8 +1397,8 @@ void test__mkdir__arg2__notuninit() {
 }
 
 void test__rmdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rmdir(arg1);
+  int x = 1;
+  if (cond) { x=100; rmdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1421,8 +1421,8 @@ void test__rmdir__arg1__notuninit() {
 }
 
 void test__chdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else chdir(arg1);
+  int x = 1;
+  if (cond) { x=100; chdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1445,8 +1445,8 @@ void test__chdir__arg1__notuninit() {
 }
 
 void test__chroot__noreturn() {
-  int x = 100;
-  if (cond) x=1; else chroot(arg1);
+  int x = 1;
+  if (cond) { x=100; chroot(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1469,8 +1469,8 @@ void test__chroot__arg1__notuninit() {
 }
 
 void test__link__noreturn() {
-  int x = 100;
-  if (cond) x=1; else link(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; link(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1504,8 +1504,8 @@ void test__link__arg2__notuninit() {
 }
 
 void test__unlink__noreturn() {
-  int x = 100;
-  if (cond) x=1; else unlink(arg1);
+  int x = 1;
+  if (cond) { x=100; unlink(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1528,8 +1528,8 @@ void test__unlink__arg1__notuninit() {
 }
 
 void test__rename__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rename(arg1);
+  int x = 1;
+  if (cond) { x=100; rename(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1552,8 +1552,8 @@ void test__rename__arg1__notuninit() {
 }
 
 void test__stat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else stat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; stat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1581,8 +1581,8 @@ void test__stat__arg2__notnull() {
 }
 
 void test__lstat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else lstat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; lstat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1610,8 +1610,8 @@ void test__lstat__arg2__notnull() {
 }
 
 void test__fstat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fstat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fstat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1634,8 +1634,8 @@ void test__fstat__arg2__notnull() {
 }
 
 void test__chmod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else chmod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; chmod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1664,8 +1664,8 @@ void test__chmod__arg2__notuninit() {
 }
 
 void test__fchmod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fchmod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fchmod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1689,8 +1689,8 @@ void test__fchmod__arg2__notuninit() {
 }
 
 void test__chown__noreturn() {
-  int x = 100;
-  if (cond) x=1; else chown(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; chown(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1725,8 +1725,8 @@ void test__chown__arg3__notuninit() {
 }
 
 void test__lchown__noreturn() {
-  int x = 100;
-  if (cond) x=1; else lchown(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; lchown(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1761,8 +1761,8 @@ void test__lchown__arg3__notuninit() {
 }
 
 void test__fchown__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fchown(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fchown(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1792,8 +1792,8 @@ void test__fchown__arg3__notuninit() {
 }
 
 void test__times__noreturn() {
-  int x = 100;
-  if (cond) x=1; else times(arg1);
+  int x = 1;
+  if (cond) { x=100; times(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1811,8 +1811,8 @@ void test__times__arg1__notuninit() {
 }
 
 void test__utime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else utime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; utime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1841,8 +1841,8 @@ void test__utime__arg2__notuninit() {
 }
 
 void test__utimes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else utimes(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; utimes(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1871,8 +1871,8 @@ void test__utimes__arg2__notuninit() {
 }
 
 void test__opendir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = opendir(arg1);
+  int x = 1;
+  if (cond) { x=100; result = opendir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1894,8 +1894,8 @@ void test__opendir__arg1__notuninit() {
 }
 
 void test__fdopendir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fdopendir(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fdopendir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1912,8 +1912,8 @@ void test__fdopendir__arg1__notuninit() {
 }
 
 void test__isatty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isatty(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isatty(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1936,8 +1936,8 @@ void test__isatty__arg1__notuninit() {
 }
 
 void test__popen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = popen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = popen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1970,8 +1970,8 @@ void test__popen__arg2__notuninit() {
 }
 
 void test__pclose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pclose(arg1);
+  int x = 1;
+  if (cond) { x=100; pclose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1988,8 +1988,8 @@ void test__pclose__arg1__notuninit() {
 }
 
 void test__socket__noreturn() {
-  int x = 100;
-  if (cond) x=1; else socket(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; socket(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2013,8 +2013,8 @@ void test__socket__arg3__notuninit() {
 }
 
 void test__nice__noreturn() {
-  int x = 100;
-  if (cond) x=1; else nice(arg1);
+  int x = 1;
+  if (cond) { x=100; nice(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2032,8 +2032,8 @@ void test__nice__arg1__notuninit() {
 }
 
 void test__pause__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pause();
+  int x = 1;
+  if (cond) { x=100; pause(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2045,8 +2045,8 @@ void test__pause__leakignore() {
 }
 
 void test__close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else close(arg1);
+  int x = 1;
+  if (cond) { x=100; close(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2058,8 +2058,8 @@ void test__close__arg1__notuninit() {
 }
 
 void test__confstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else confstr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; confstr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2089,8 +2089,8 @@ void test__confstr__arg3__notuninit() {
 }
 
 void test__fpathconf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fpathconf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fpathconf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2114,8 +2114,8 @@ void test__fpathconf__arg2__notuninit() {
 }
 
 void test__pathconf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pathconf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; pathconf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2144,8 +2144,8 @@ void test__pathconf__arg2__notuninit() {
 }
 
 void test__sysconf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sysconf(arg1);
+  int x = 1;
+  if (cond) { x=100; sysconf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2163,8 +2163,8 @@ void test__sysconf__arg1__notuninit() {
 }
 
 void test__fdopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fdopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fdopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2192,8 +2192,8 @@ void test__fdopen__arg2__notuninit() {
 }
 
 void test__random__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = random();
+  int x = 1;
+  if (cond) { x=100; result = random(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2204,15 +2204,15 @@ void test__random__useretval() {
 }
 
 void test__srandom__noreturn() {
-  int x = 100;
-  if (cond) x=1; else srandom(arg1);
+  int x = 1;
+  if (cond) { x=100; srandom(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__rewinddir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rewinddir(arg1);
+  int x = 1;
+  if (cond) { x=100; rewinddir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2235,8 +2235,8 @@ void test__rewinddir__arg1__notuninit() {
 }
 
 void test__seekdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else seekdir(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; seekdir(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2265,8 +2265,8 @@ void test__seekdir__arg2__notuninit() {
 }
 
 void test__rand_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rand_r(arg1);
+  int x = 1;
+  if (cond) { x=100; rand_r(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2283,8 +2283,8 @@ void test__rand_r__arg1__notnull() {
 }
 
 void test__strcasecmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strcasecmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strcasecmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2323,8 +2323,8 @@ void test__strcasecmp__arg2__notuninit() {
 }
 
 void test__strncasecmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strncasecmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strncasecmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2386,8 +2386,8 @@ void test__read__arg3__notuninit() {
 }
 
 void test__write__noreturn() {
-  int x = 100;
-  if (cond) x=1; else write(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; write(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2519,8 +2519,8 @@ void test__sendmsg__arg3__notuninit() {
 }
 
 void test__mmap__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = mmap(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = mmap(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2573,8 +2573,8 @@ void test__mmap__arg6__notuninit() {
 }
 
 void test__mmap64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = mmap64(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = mmap64(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2627,8 +2627,8 @@ void test__mmap64__arg6__notuninit() {
 }
 
 void test__munmap__noreturn() {
-  int x = 100;
-  if (cond) x=1; else munmap(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; munmap(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2651,8 +2651,8 @@ void test__munmap__arg2__notuninit() {
 }
 
 void test__openlog__noreturn() {
-  int x = 100;
-  if (cond) x=1; else openlog(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; openlog(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2682,8 +2682,8 @@ void test__openlog__arg3__notuninit() {
 }
 
 void test__fcntl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fcntl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fcntl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2707,8 +2707,8 @@ void test__fcntl__arg2__notuninit() {
 }
 
 void test__ioctl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ioctl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ioctl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2732,8 +2732,8 @@ void test__ioctl__arg2__notuninit() {
 }
 
 void test__syslog__noreturn() {
-  int x = 100;
-  if (cond) x=1; else syslog(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; syslog(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2751,8 +2751,8 @@ void test__syslog__arg1__notuninit() {
 }
 
 void test__vsyslog__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsyslog(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vsyslog(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2770,8 +2770,8 @@ void test__vsyslog__arg1__notuninit() {
 }
 
 void test__getgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getgid();
+  int x = 1;
+  if (cond) { x=100; result = getgid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2782,8 +2782,8 @@ void test__getgid__useretval() {
 }
 
 void test__getegid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getegid();
+  int x = 1;
+  if (cond) { x=100; result = getegid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2794,8 +2794,8 @@ void test__getegid__useretval() {
 }
 
 void test__getuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getuid();
+  int x = 1;
+  if (cond) { x=100; result = getuid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2812,8 +2812,8 @@ void test__getuid__leakignore() {
 }
 
 void test__getsid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getsid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getsid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2836,8 +2836,8 @@ void test__getsid__arg1__notuninit() {
 }
 
 void test__geteuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = geteuid();
+  int x = 1;
+  if (cond) { x=100; result = geteuid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2854,8 +2854,8 @@ void test__geteuid__leakignore() {
 }
 
 void test__getppid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getppid();
+  int x = 1;
+  if (cond) { x=100; result = getppid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2872,8 +2872,8 @@ void test__getppid__leakignore() {
 }
 
 void test__getpid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpid();
+  int x = 1;
+  if (cond) { x=100; result = getpid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2890,8 +2890,8 @@ void test__getpid__leakignore() {
 }
 
 void test__getpgrp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpgrp();
+  int x = 1;
+  if (cond) { x=100; result = getpgrp(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2908,8 +2908,8 @@ void test__getpgrp__leakignore() {
 }
 
 void test__getpgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpgid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getpgid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2932,8 +2932,8 @@ void test__getpgid__arg1__notuninit() {
 }
 
 void test__setuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = setuid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = setuid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2956,8 +2956,8 @@ void test__setuid__arg1__notuninit() {
 }
 
 void test__seteuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = seteuid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = seteuid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2980,8 +2980,8 @@ void test__seteuid__arg1__notuninit() {
 }
 
 void test__setgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = setgid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = setgid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3004,8 +3004,8 @@ void test__setgid__arg1__notuninit() {
 }
 
 void test__setegid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = setegid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = setegid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3028,8 +3028,8 @@ void test__setegid__arg1__notuninit() {
 }
 
 void test__setpgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setpgid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setpgid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3047,22 +3047,22 @@ void test__setpgid__arg2__notuninit() {
 }
 
 void test__pipe__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pipe();
+  int x = 1;
+  if (cond) { x=100; pipe(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__setpgrp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setpgrp();
+  int x = 1;
+  if (cond) { x=100; setpgrp(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__setregid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setregid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setregid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3080,8 +3080,8 @@ void test__setregid__arg2__notuninit() {
 }
 
 void test__setreuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setreuid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setreuid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3099,8 +3099,8 @@ void test__setreuid__arg2__notuninit() {
 }
 
 void test__setfsuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setfsuid(arg1);
+  int x = 1;
+  if (cond) { x=100; setfsuid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3118,8 +3118,8 @@ void test__setfsuid__arg1__notuninit() {
 }
 
 void test__setfsgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setfsgid(arg1);
+  int x = 1;
+  if (cond) { x=100; setfsgid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3137,15 +3137,15 @@ void test__setfsgid__arg1__notuninit() {
 }
 
 void test__setsid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setsid();
+  int x = 1;
+  if (cond) { x=100; setsid(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__getwd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getwd(arg1);
+  int x = 1;
+  if (cond) { x=100; getwd(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3162,8 +3162,8 @@ void test__getwd__arg1__notnull() {
 }
 
 void test__htonl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else htonl(arg1);
+  int x = 1;
+  if (cond) { x=100; htonl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3175,8 +3175,8 @@ void test__htonl__arg1__notuninit() {
 }
 
 void test__htons__noreturn() {
-  int x = 100;
-  if (cond) x=1; else htons(arg1);
+  int x = 1;
+  if (cond) { x=100; htons(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3188,8 +3188,8 @@ void test__htons__arg1__notuninit() {
 }
 
 void test__ntohl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ntohl(arg1);
+  int x = 1;
+  if (cond) { x=100; ntohl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3201,8 +3201,8 @@ void test__ntohl__arg1__notuninit() {
 }
 
 void test__ntohs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ntohs(arg1);
+  int x = 1;
+  if (cond) { x=100; ntohs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3214,8 +3214,8 @@ void test__ntohs__arg1__notuninit() {
 }
 
 void test__mq_close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_close(arg1);
+  int x = 1;
+  if (cond) { x=100; mq_close(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3227,8 +3227,8 @@ void test__mq_close__arg1__notuninit() {
 }
 
 void test__mq_getattr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_getattr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mq_getattr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3240,8 +3240,8 @@ void test__mq_getattr__arg1__notuninit() {
 }
 
 void test__mq_notify__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_notify(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mq_notify(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3258,15 +3258,15 @@ void test__mq_notify__arg1__notuninit() {
 }
 
 void test__mq_open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_open();
+  int x = 1;
+  if (cond) { x=100; mq_open(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__mq_receive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_receive(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mq_receive(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3278,8 +3278,8 @@ void test__mq_receive__arg1__notuninit() {
 }
 
 void test__mq_send__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_send(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mq_send(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3291,8 +3291,8 @@ void test__mq_send__arg1__notuninit() {
 }
 
 void test__mq_setattr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_setattr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; mq_setattr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3304,8 +3304,8 @@ void test__mq_setattr__arg1__notuninit() {
 }
 
 void test__mq_timedreceive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_timedreceive(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; mq_timedreceive(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3317,8 +3317,8 @@ void test__mq_timedreceive__arg1__notuninit() {
 }
 
 void test__mq_timedsend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_timedsend(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; mq_timedsend(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3330,8 +3330,8 @@ void test__mq_timedsend__arg1__notuninit() {
 }
 
 void test__mq_unlink__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mq_unlink(arg1);
+  int x = 1;
+  if (cond) { x=100; mq_unlink(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3348,8 +3348,8 @@ void test__mq_unlink__arg1__notuninit() {
 }
 
 void test__dbm_clearerr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dbm_clearerr(arg1);
+  int x = 1;
+  if (cond) { x=100; dbm_clearerr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3366,8 +3366,8 @@ void test__dbm_clearerr__arg1__notuninit() {
 }
 
 void test__dbm_close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dbm_close(arg1);
+  int x = 1;
+  if (cond) { x=100; dbm_close(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3384,8 +3384,8 @@ void test__dbm_close__arg1__notuninit() {
 }
 
 void test__dbm_delete__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dbm_delete(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; dbm_delete(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3408,8 +3408,8 @@ void test__dbm_delete__arg2__notuninit() {
 }
 
 void test__dbm_error__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = dbm_error(arg1);
+  int x = 1;
+  if (cond) { x=100; result = dbm_error(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3431,8 +3431,8 @@ void test__dbm_error__arg1__notuninit() {
 }
 
 void test__dbm_fetch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = dbm_fetch(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = dbm_fetch(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3460,8 +3460,8 @@ void test__dbm_fetch__arg2__notuninit() {
 }
 
 void test__dbm_firstkey__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = dbm_firstkey(arg1);
+  int x = 1;
+  if (cond) { x=100; result = dbm_firstkey(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3483,8 +3483,8 @@ void test__dbm_firstkey__arg1__notuninit() {
 }
 
 void test__dbm_nextkey__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = dbm_nextkey(arg1);
+  int x = 1;
+  if (cond) { x=100; result = dbm_nextkey(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3506,8 +3506,8 @@ void test__dbm_nextkey__arg1__notuninit() {
 }
 
 void test__dbm_open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dbm_open(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; dbm_open(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3536,8 +3536,8 @@ void test__dbm_open__arg3__notuninit() {
 }
 
 void test__dbm_store__noreturn() {
-  int x = 100;
-  if (cond) x=1; else dbm_store(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; dbm_store(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3572,8 +3572,8 @@ void test__dbm_store__arg4__notuninit() {
 }
 
 void test__freeaddrinfo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else freeaddrinfo(arg1);
+  int x = 1;
+  if (cond) { x=100; freeaddrinfo(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3590,8 +3590,8 @@ void test__freeaddrinfo__arg1__notuninit() {
 }
 
 void test__getaddrinfo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getaddrinfo(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; getaddrinfo(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3621,15 +3621,15 @@ void test__getaddrinfo__arg4__notuninit() {
 }
 
 void test__endhostent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else endhostent();
+  int x = 1;
+  if (cond) { x=100; endhostent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__sethostent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sethostent(arg1);
+  int x = 1;
+  if (cond) { x=100; sethostent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3641,8 +3641,8 @@ void test__sethostent__arg1__notuninit() {
 }
 
 void test__uname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else uname(arg1);
+  int x = 1;
+  if (cond) { x=100; uname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3653,15 +3653,15 @@ void test__uname__arg1__notnull() {
 }
 
 void test__endpwent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else endpwent();
+  int x = 1;
+  if (cond) { x=100; endpwent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__getpwent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpwent();
+  int x = 1;
+  if (cond) { x=100; result = getpwent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3672,8 +3672,8 @@ void test__getpwent__useretval() {
 }
 
 void test__getpwnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpwnam(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getpwnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3690,8 +3690,8 @@ void test__getpwnam__arg1__notuninit() {
 }
 
 void test__strtok_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtok_r(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtok_r(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3730,8 +3730,8 @@ void test__strtok_r__arg3__notnull() {
 }
 
 void test__getpwnam_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpwnam_r(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = getpwnam_r(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3754,8 +3754,8 @@ void test__getpwnam_r__arg4__notuninit() {
 }
 
 void test__getpwuid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getpwuid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getpwuid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3772,8 +3772,8 @@ void test__getpwuid__arg1__notuninit() {
 }
 
 void test__getpwuid_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getpwuid_r(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; getpwuid_r(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3791,15 +3791,15 @@ void test__getpwuid_r__arg4__notuninit() {
 }
 
 void test__setpwent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setpwent();
+  int x = 1;
+  if (cond) { x=100; setpwent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__catclose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else catclose(arg1);
+  int x = 1;
+  if (cond) { x=100; catclose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3811,8 +3811,8 @@ void test__catclose__arg1__notuninit() {
 }
 
 void test__catgets__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catgets(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = catgets(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3847,8 +3847,8 @@ void test__catgets__arg4__notuninit() {
 }
 
 void test__catopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else catopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; catopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3871,8 +3871,8 @@ void test__catopen__arg2__notuninit() {
 }
 
 void test__poll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else poll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; poll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3896,8 +3896,8 @@ void test__poll__arg3__notuninit() {
 }
 
 void test__regcomp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else regcomp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; regcomp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3920,8 +3920,8 @@ void test__regcomp__arg3__notuninit() {
 }
 
 void test__regerror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else regerror(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; regerror(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3945,8 +3945,8 @@ void test__regerror__arg4__notuninit() {
 }
 
 void test__regexec__noreturn() {
-  int x = 100;
-  if (cond) x=1; else regexec(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; regexec(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3992,8 +3992,8 @@ void test__regexec__arg5__notuninit() {
 }
 
 void test__regfree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else regfree(arg1);
+  int x = 1;
+  if (cond) { x=100; regfree(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4010,8 +4010,8 @@ void test__regfree__arg1__notuninit() {
 }
 
 void test__sched_get_priority_max__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_get_priority_max(arg1);
+  int x = 1;
+  if (cond) { x=100; sched_get_priority_max(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4023,8 +4023,8 @@ void test__sched_get_priority_max__arg1__notuninit() {
 }
 
 void test__sched_get_priority_min__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_get_priority_min(arg1);
+  int x = 1;
+  if (cond) { x=100; sched_get_priority_min(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4036,8 +4036,8 @@ void test__sched_get_priority_min__arg1__notuninit() {
 }
 
 void test__sched_getparam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_getparam(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sched_getparam(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4054,8 +4054,8 @@ void test__sched_getparam__arg2__notnull() {
 }
 
 void test__sched_getscheduler__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_getscheduler(arg1);
+  int x = 1;
+  if (cond) { x=100; sched_getscheduler(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4067,8 +4067,8 @@ void test__sched_getscheduler__arg1__notuninit() {
 }
 
 void test__sched_rr_get_interval__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_rr_get_interval(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sched_rr_get_interval(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4085,8 +4085,8 @@ void test__sched_rr_get_interval__arg2__notnull() {
 }
 
 void test__sched_setparam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_setparam(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sched_setparam(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4104,8 +4104,8 @@ void test__sched_setparam__arg2__notuninit() {
 }
 
 void test__sched_setscheduler__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_setscheduler(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; sched_setscheduler(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4129,15 +4129,15 @@ void test__sched_setscheduler__arg3__notuninit() {
 }
 
 void test__sched_yield__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sched_yield();
+  int x = 1;
+  if (cond) { x=100; sched_yield(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__ecvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ecvt(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; ecvt(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4165,8 +4165,8 @@ void test__ecvt__arg4__notnull() {
 }
 
 void test__fcvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fcvt(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; fcvt(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4194,8 +4194,8 @@ void test__fcvt__arg4__notnull() {
 }
 
 void test__gcvt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else gcvt(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; gcvt(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4218,8 +4218,8 @@ void test__gcvt__arg3__notnull() {
 }
 
 void test__lseek__noreturn() {
-  int x = 100;
-  if (cond) x=1; else lseek(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; lseek(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4249,8 +4249,8 @@ void test__lseek__arg3__notuninit() {
 }
 
 void test__nanosleep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else nanosleep(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; nanosleep(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4267,8 +4267,8 @@ void test__nanosleep__arg1__notnull() {
 }
 
 void test__setkey__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setkey(arg1);
+  int x = 1;
+  if (cond) { x=100; setkey(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4291,8 +4291,8 @@ void test__setkey__arg1__notuninit() {
 }
 
 void test__getpass__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getpass(arg1);
+  int x = 1;
+  if (cond) { x=100; getpass(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4309,8 +4309,8 @@ void test__getpass__arg1__notnull() {
 }
 
 void test__drand48__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = drand48();
+  int x = 1;
+  if (cond) { x=100; result = drand48(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4321,8 +4321,8 @@ void test__drand48__useretval() {
 }
 
 void test__putenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else putenv(arg1);
+  int x = 1;
+  if (cond) { x=100; putenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4339,8 +4339,8 @@ void test__putenv__arg1__notuninit() {
 }
 
 void test__setenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setenv(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; setenv(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4374,8 +4374,8 @@ void test__setenv__arg3__notuninit() {
 }
 
 void test__unsetenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else unsetenv(arg1);
+  int x = 1;
+  if (cond) { x=100; unsetenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4392,8 +4392,8 @@ void test__unsetenv__arg1__notuninit() {
 }
 
 void test__localtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else localtime(arg1);
+  int x = 1;
+  if (cond) { x=100; localtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4416,8 +4416,8 @@ void test__localtime__arg1__notuninit() {
 }
 
 void test__std__localtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::localtime(arg1);
+  int x = 1;
+  if (cond) { x=100; std::localtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4440,8 +4440,8 @@ void test__std__localtime__arg1__notuninit() {
 }
 
 void test__localtime_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else localtime_r(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; localtime_r(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4469,8 +4469,8 @@ void test__localtime_r__arg2__notnull() {
 }
 
 void test__readdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readdir(arg1);
+  int x = 1;
+  if (cond) { x=100; readdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4493,8 +4493,8 @@ void test__readdir__arg1__notuninit() {
 }
 
 void test__readdir_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readdir_r(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; readdir_r(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4527,8 +4527,8 @@ void test__readdir_r__arg3__notnull() {
 }
 
 void test__readlink__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readlink(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; readlink(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4562,8 +4562,8 @@ void test__readlink__arg3__notuninit() {
 }
 
 void test__readlinkat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else readlinkat(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; readlinkat(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4603,8 +4603,8 @@ void test__readlinkat__arg4__notuninit() {
 }
 
 void test__asctime_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else asctime_r(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; asctime_r(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4632,8 +4632,8 @@ void test__asctime_r__arg2__notnull() {
 }
 
 void test__ctime_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ctime_r(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ctime_r(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4661,8 +4661,8 @@ void test__ctime_r__arg2__notnull() {
 }
 
 void test__gmtime_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else gmtime_r(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; gmtime_r(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4690,8 +4690,8 @@ void test__gmtime_r__arg2__notnull() {
 }
 
 void test__gmtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gmtime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = gmtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4719,8 +4719,8 @@ void test__gmtime__arg1__notuninit() {
 }
 
 void test__clock_settime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else clock_settime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; clock_settime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4738,8 +4738,8 @@ void test__clock_settime__arg2__notuninit() {
 }
 
 void test__killpg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else killpg(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; killpg(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4757,8 +4757,8 @@ void test__killpg__arg2__notuninit() {
 }
 
 void test__kill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else kill(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; kill(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4776,8 +4776,8 @@ void test__kill__arg2__notuninit() {
 }
 
 void test__clock_gettime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else clock_gettime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; clock_gettime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4794,8 +4794,8 @@ void test__clock_gettime__arg2__notnull() {
 }
 
 void test__clock_getres__noreturn() {
-  int x = 100;
-  if (cond) x=1; else clock_getres(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; clock_getres(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4807,8 +4807,8 @@ void test__clock_getres__arg1__notuninit() {
 }
 
 void test__tmpnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tmpnam(arg1);
+  int x = 1;
+  if (cond) { x=100; tmpnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4826,8 +4826,8 @@ void test__tmpnam__arg1__notuninit() {
 }
 
 void test__tmpnam_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tmpnam_r(arg1);
+  int x = 1;
+  if (cond) { x=100; tmpnam_r(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4845,8 +4845,8 @@ void test__tmpnam_r__arg1__notuninit() {
 }
 
 void test__makecontext__noreturn() {
-  int x = 100;
-  if (cond) x=1; else makecontext(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; makecontext(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4880,8 +4880,8 @@ void test__makecontext__arg3__notuninit() {
 }
 
 void test__swapcontext__noreturn() {
-  int x = 100;
-  if (cond) x=1; else swapcontext(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; swapcontext(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4903,8 +4903,8 @@ void test__swapcontext__arg2__notnull() {
 }
 
 void test__getcontext__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getcontext(arg1);
+  int x = 1;
+  if (cond) { x=100; getcontext(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4921,8 +4921,8 @@ void test__getcontext__arg1__notnull() {
 }
 
 void test__ualarm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ualarm(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ualarm(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4946,8 +4946,8 @@ void test__ualarm__arg2__notuninit() {
 }
 
 void test__scalb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalb(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalb(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4976,8 +4976,8 @@ void test__scalb__arg2__notuninit() {
 }
 
 void test__bcopy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else bcopy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; bcopy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5011,8 +5011,8 @@ void test__bcopy__arg3__notuninit() {
 }
 
 void test__bcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = bcmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = bcmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5057,8 +5057,8 @@ void test__bcmp__arg3__notuninit() {
 }
 
 void test__bzero__noreturn() {
-  int x = 100;
-  if (cond) x=1; else bzero(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; bzero(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5081,8 +5081,8 @@ void test__bzero__arg2__notuninit() {
 }
 
 void test__ftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ftime(arg1);
+  int x = 1;
+  if (cond) { x=100; ftime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5100,8 +5100,8 @@ void test__ftime__arg1__notuninit() {
 }
 
 void test__wcswcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcswcs(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcswcs(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5140,8 +5140,8 @@ void test__wcswcs__arg2__notuninit() {
 }
 
 void test__stpcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else stpcpy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; stpcpy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5169,8 +5169,8 @@ void test__stpcpy__arg2__notuninit() {
 }
 
 void test__index__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = index(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = index(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5204,8 +5204,8 @@ void test__index__arg2__notuninit() {
 }
 
 void test__rindex__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = rindex(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = rindex(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5239,8 +5239,8 @@ void test__rindex__arg2__notuninit() {
 }
 
 void test__bsd_signal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else bsd_signal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; bsd_signal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5264,8 +5264,8 @@ void test__bsd_signal__arg2__notuninit() {
 }
 
 void test__fork__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fork();
+  int x = 1;
+  if (cond) { x=100; fork(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5277,8 +5277,8 @@ void test__fork__leakignore() {
 }
 
 void test__vfork__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfork();
+  int x = 1;
+  if (cond) { x=100; vfork(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5290,8 +5290,8 @@ void test__vfork__leakignore() {
 }
 
 void test__pthread_atfork__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_atfork(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; pthread_atfork(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5303,8 +5303,8 @@ void test__pthread_atfork__leakignore() {
 }
 
 void test__pthread_create__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_create(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; pthread_create(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5320,8 +5320,8 @@ void test__pthread_create__arg3__notnull() {
 }
 
 void test__pthread_detach__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_detach(arg1);
+  int x = 1;
+  if (cond) { x=100; pthread_detach(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5333,8 +5333,8 @@ void test__pthread_detach__arg1__notuninit() {
 }
 
 void test__pthread_equal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = pthread_equal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = pthread_equal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5357,15 +5357,15 @@ void test__pthread_equal__arg2__notuninit() {
 }
 
 void test__pthread_exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_exit(arg1);
+  int x = 1;
+  if (cond) { x=100; pthread_exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__pthread_join__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_join(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; pthread_join(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5377,8 +5377,8 @@ void test__pthread_join__arg1__notuninit() {
 }
 
 void test__pthread_kill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_kill(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; pthread_kill(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5396,8 +5396,8 @@ void test__pthread_kill__arg2__notuninit() {
 }
 
 void test__pthread_self__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = pthread_self();
+  int x = 1;
+  if (cond) { x=100; result = pthread_self(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5408,8 +5408,8 @@ void test__pthread_self__useretval() {
 }
 
 void test__pthread_attr_destroy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_attr_destroy(arg1);
+  int x = 1;
+  if (cond) { x=100; pthread_attr_destroy(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5420,8 +5420,8 @@ void test__pthread_attr_destroy__arg1__notnull() {
 }
 
 void test__pthread_attr_init__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_attr_init(arg1);
+  int x = 1;
+  if (cond) { x=100; pthread_attr_init(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5432,8 +5432,8 @@ void test__pthread_attr_init__arg1__notnull() {
 }
 
 void test__pthread_attr_setstackaddr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_attr_setstackaddr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; pthread_attr_setstackaddr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5467,8 +5467,8 @@ void test__pthread_attr_setstackaddr__arg2__notuninit() {
 }
 
 void test__pthread_attr_getstackaddr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_attr_getstackaddr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; pthread_attr_getstackaddr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5496,8 +5496,8 @@ void test__pthread_attr_getstackaddr__arg2__notnull() {
 }
 
 void test__tempnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tempnam(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = tempnam(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5526,8 +5526,8 @@ void test__tempnam__arg2__notuninit() {
 }
 
 void test__crypt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = crypt(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = crypt(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5566,8 +5566,8 @@ void test__crypt__arg2__notuninit() {
 }
 
 void test__ttyname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ttyname(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ttyname(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5590,8 +5590,8 @@ void test__ttyname__arg1__notuninit() {
 }
 
 void test__getspnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getspnam(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getspnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5619,8 +5619,8 @@ void test__getspnam__arg1__notuninit() {
 }
 
 void test__getspent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getspent();
+  int x = 1;
+  if (cond) { x=100; result = getspent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5637,8 +5637,8 @@ void test__getspent__leakignore() {
 }
 
 void test__fgetspent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fgetspent(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fgetspent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5666,8 +5666,8 @@ void test__fgetspent__arg1__notuninit() {
 }
 
 void test__sgetspent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sgetspent(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sgetspent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5695,8 +5695,8 @@ void test__sgetspent__arg1__notuninit() {
 }
 
 void test__fgetpwent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fgetpwent(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fgetpwent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5724,8 +5724,8 @@ void test__fgetpwent__arg1__notuninit() {
 }
 
 void test__getgrent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getgrent();
+  int x = 1;
+  if (cond) { x=100; result = getgrent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5742,8 +5742,8 @@ void test__getgrent__leakignore() {
 }
 
 void test__getgrent_r__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getgrent_r(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = getgrent_r(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5772,8 +5772,8 @@ void test__getgrent_r__arg3__notuninit() {
 }
 
 void test__fgetgrent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fgetgrent(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fgetgrent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5801,8 +5801,8 @@ void test__fgetgrent__arg1__notuninit() {
 }
 
 void test__getnetgrent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getnetgrent(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getnetgrent(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5829,8 +5829,8 @@ void test__getnetgrent__arg3__notnull() {
 }
 
 void test__getgrnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getgrnam(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getgrnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5858,8 +5858,8 @@ void test__getgrnam__arg1__notuninit() {
 }
 
 void test__getgrgid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getgrgid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getgrgid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5882,8 +5882,8 @@ void test__getgrgid__arg1__notuninit() {
 }
 
 void test__getlogin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getlogin();
+  int x = 1;
+  if (cond) { x=100; result = getlogin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5900,8 +5900,8 @@ void test__getlogin__leakignore() {
 }
 
 void test__ctermid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ctermid(arg1);
+  int x = 1;
+  if (cond) { x=100; ctermid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5913,8 +5913,8 @@ void test__ctermid__leakignore() {
 }
 
 void test__realpath__noreturn() {
-  int x = 100;
-  if (cond) x=1; else realpath(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; realpath(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5937,8 +5937,8 @@ void test__realpath__arg1__notuninit() {
 }
 
 void test__remove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else remove(arg1);
+  int x = 1;
+  if (cond) { x=100; remove(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5961,8 +5961,8 @@ void test__remove__arg1__notuninit() {
 }
 
 void test__fileno__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fileno(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fileno(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5990,8 +5990,8 @@ void test__fileno__arg1__notuninit() {
 }
 
 void test__fseeko__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fseeko(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fseeko(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6026,8 +6026,8 @@ void test__fseeko__arg3__notuninit() {
 }
 
 void test__ftello__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ftello(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ftello(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6055,8 +6055,8 @@ void test__ftello__arg1__notuninit() {
 }
 
 void test__execv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else execv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; execv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6085,8 +6085,8 @@ void test__execv__arg2__notuninit() {
 }
 
 void test__execvp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else execvp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; execvp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6115,8 +6115,8 @@ void test__execvp__arg2__notuninit() {
 }
 
 void test__wait__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wait(arg1);
+  int x = 1;
+  if (cond) { x=100; wait(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6128,8 +6128,8 @@ void test__wait__leakignore() {
 }
 
 void test__waitpid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else waitpid(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; waitpid(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6153,8 +6153,8 @@ void test__waitpid__arg3__notuninit() {
 }
 
 void test__strnlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strnlen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strnlen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6188,8 +6188,8 @@ void test__strnlen__arg2__notuninit() {
 }
 
 void test__wcsnlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsnlen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcsnlen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6223,8 +6223,8 @@ void test__wcsnlen__arg2__notuninit() {
 }
 
 void test__ffs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ffs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ffs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6247,8 +6247,8 @@ void test__ffs__arg1__notuninit() {
 }
 
 void test__shmctl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else shmctl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; shmctl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6272,8 +6272,8 @@ void test__shmctl__arg2__notuninit() {
 }
 
 void test__shmget__noreturn() {
-  int x = 100;
-  if (cond) x=1; else shmget(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; shmget(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6303,8 +6303,8 @@ void test__shmget__arg3__notuninit() {
 }
 
 void test__shmat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else shmat(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; shmat(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6328,8 +6328,8 @@ void test__shmat__arg3__notuninit() {
 }
 
 void test__shmdt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else shmdt(arg1);
+  int x = 1;
+  if (cond) { x=100; shmdt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6341,8 +6341,8 @@ void test__shmdt__leakignore() {
 }
 
 void test__getrlimit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getrlimit(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; getrlimit(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6365,8 +6365,8 @@ void test__getrlimit__arg2__notnull() {
 }
 
 void test__setrlimit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setrlimit(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setrlimit(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6395,8 +6395,8 @@ void test__setrlimit__arg2__notuninit() {
 }
 
 void test__glob__noreturn() {
-  int x = 100;
-  if (cond) x=1; else glob(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; glob(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6430,8 +6430,8 @@ void test__glob__arg4__notnull() {
 }
 
 void test__globfree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else globfree(arg1);
+  int x = 1;
+  if (cond) { x=100; globfree(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6448,8 +6448,8 @@ void test__globfree__arg1__notuninit() {
 }
 
 void test__wcpncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcpncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcpncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6488,8 +6488,8 @@ void test__wcpncpy__arg3__notuninit() {
 }
 
 void test__stpncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else stpncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; stpncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6528,8 +6528,8 @@ void test__stpncpy__arg3__notuninit() {
 }
 
 void test__memccpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memccpy(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; memccpy(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6569,8 +6569,8 @@ void test__memccpy__arg4__notuninit() {
 }
 
 void test__getopt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getopt(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getopt(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6610,8 +6610,8 @@ void test__getopt__arg3__notuninit() {
 }
 
 void test__getitimer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getitimer(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; getitimer(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6640,8 +6640,8 @@ void test__getitimer__arg2__notuninit() {
 }
 
 void test__setitimer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setitimer(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; setitimer(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6671,8 +6671,8 @@ void test__setitimer__arg3__notuninit() {
 }
 
 void test__sigaction__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigaction(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; sigaction(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6690,8 +6690,8 @@ void test__sigaction__arg1__notuninit() {
 }
 
 void test__sigaltstack__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigaltstack(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sigaltstack(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6709,8 +6709,8 @@ void test__sigaltstack__arg1__notuninit() {
 }
 
 void test__siglongjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else siglongjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; siglongjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6728,8 +6728,8 @@ void test__siglongjmp__arg2__notuninit() {
 }
 
 void test___longjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _longjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _longjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6747,8 +6747,8 @@ void test___longjmp__arg2__notuninit() {
 }
 
 void test__sigsetjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigsetjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sigsetjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6760,8 +6760,8 @@ void test__sigsetjmp__arg2__notuninit() {
 }
 
 void test___setjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _setjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _setjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6773,8 +6773,8 @@ void test___setjmp__arg2__notuninit() {
 }
 
 void test__sigsuspend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigsuspend(arg1);
+  int x = 1;
+  if (cond) { x=100; sigsuspend(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6791,8 +6791,8 @@ void test__sigsuspend__arg1__notnull() {
 }
 
 void test__pthread_sigmask__noreturn() {
-  int x = 100;
-  if (cond) x=1; else pthread_sigmask(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; pthread_sigmask(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6816,8 +6816,8 @@ void test__pthread_sigmask__arg3__notuninit() {
 }
 
 void test__sigprocmask__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigprocmask(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; sigprocmask(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6841,8 +6841,8 @@ void test__sigprocmask__arg3__notuninit() {
 }
 
 void test__getrusage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getrusage(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; getrusage(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6865,8 +6865,8 @@ void test__getrusage__arg2__notnull() {
 }
 
 void test__sigemptyset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigemptyset(arg1);
+  int x = 1;
+  if (cond) { x=100; sigemptyset(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6883,8 +6883,8 @@ void test__sigemptyset__arg1__notnull() {
 }
 
 void test__sigfillset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigfillset(arg1);
+  int x = 1;
+  if (cond) { x=100; sigfillset(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6901,8 +6901,8 @@ void test__sigfillset__arg1__notnull() {
 }
 
 void test__sigaddset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigaddset(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sigaddset(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6925,8 +6925,8 @@ void test__sigaddset__arg2__notuninit() {
 }
 
 void test__sigdelset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigdelset(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sigdelset(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6949,8 +6949,8 @@ void test__sigdelset__arg2__notuninit() {
 }
 
 void test__sigismember__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sigismember(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sigismember(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6973,8 +6973,8 @@ void test__sigismember__arg2__notuninit() {
 }
 
 void test__posix_spawn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else posix_spawn(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; posix_spawn(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6986,8 +6986,8 @@ void test__posix_spawn__leakignore() {
 }
 
 void test__posix_spawnp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else posix_spawnp(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; posix_spawnp(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6999,8 +6999,8 @@ void test__posix_spawnp__leakignore() {
 }
 
 void test__msgctl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else msgctl(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; msgctl(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7030,8 +7030,8 @@ void test__msgctl__arg3__notuninit() {
 }
 
 void test__msgget__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = msgget(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = msgget(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7054,8 +7054,8 @@ void test__msgget__arg2__notuninit() {
 }
 
 void test__msgrcv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else msgrcv(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; msgrcv(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7096,8 +7096,8 @@ void test__msgrcv__arg5__notuninit() {
 }
 
 void test__msgsnd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else msgsnd(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; msgsnd(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7132,8 +7132,8 @@ void test__msgsnd__arg4__notuninit() {
 }
 
 void test__tcflow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcflow(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; tcflow(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7157,8 +7157,8 @@ void test__tcflow__arg2__notuninit() {
 }
 
 void test__tcflush__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcflush(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; tcflush(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7182,8 +7182,8 @@ void test__tcflush__arg2__notuninit() {
 }
 
 void test__tcsendbreak__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcsendbreak(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; tcsendbreak(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7206,8 +7206,8 @@ void test__tcsendbreak__arg2__notnull() {
 }
 
 void test__tcgetattr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcgetattr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; tcgetattr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7230,8 +7230,8 @@ void test__tcgetattr__arg2__notnull() {
 }
 
 void test__tcsetattr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcsetattr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; tcsetattr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7266,8 +7266,8 @@ void test__tcsetattr__arg3__notuninit() {
 }
 
 void test__cfsetospeed__noreturn() {
-  int x = 100;
-  if (cond) x=1; else cfsetospeed(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; cfsetospeed(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7296,8 +7296,8 @@ void test__cfsetospeed__arg2__notuninit() {
 }
 
 void test__cfsetispeed__noreturn() {
-  int x = 100;
-  if (cond) x=1; else cfsetispeed(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; cfsetispeed(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7326,8 +7326,8 @@ void test__cfsetispeed__arg2__notuninit() {
 }
 
 void test__tcdrain__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tcdrain(arg1);
+  int x = 1;
+  if (cond) { x=100; tcdrain(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-qt.cpp b/test/cfg/generated-cfg-tests-qt.cpp
index ef293e5cb..42fd2b659 100644
--- a/test/cfg/generated-cfg-tests-qt.cpp
+++ b/test/cfg/generated-cfg-tests-qt.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/qt.cfg > generated-cfg-tests-qt.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-qt.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-qt.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__connect__noreturn() {
-  int x = 100;
-  if (cond) x=1; else connect(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; connect(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -50,8 +50,8 @@ void test__connect__arg4__notuninit() {
 }
 
 void test__disconnect__noreturn() {
-  int x = 100;
-  if (cond) x=1; else disconnect(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; disconnect(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -91,8 +91,8 @@ void test__disconnect__arg4__notuninit() {
 }
 
 void test__tr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = tr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -132,8 +132,8 @@ void test__tr__arg3__notuninit() {
 }
 
 void test__QObject__tr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QObject::tr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QObject::tr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -173,8 +173,8 @@ void test__QObject__tr__arg3__notuninit() {
 }
 
 void test__QSettings__setValue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QSettings::setValue(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; QSettings::setValue(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -203,8 +203,8 @@ void test__QSettings__setValue__arg2__notuninit() {
 }
 
 void test__QSettings__value__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QSettings::value(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QSettings::value(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -232,8 +232,8 @@ void test__QSettings__value__arg2__notuninit() {
 }
 
 void test__QString__sprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QString::sprintf(arg1);
+  int x = 1;
+  if (cond) { x=100; QString::sprintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -251,8 +251,8 @@ void test__QString__sprintf__arg1__notuninit() {
 }
 
 void test__QString__asprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QString::asprintf(arg1);
+  int x = 1;
+  if (cond) { x=100; QString::asprintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -270,8 +270,8 @@ void test__QString__asprintf__arg1__notuninit() {
 }
 
 void test__QList__at__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::at(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QList::at(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -288,8 +288,8 @@ void test__QList__at__arg1__notuninit() {
 }
 
 void test__QString__at__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::at(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QString::at(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -306,8 +306,8 @@ void test__QString__at__arg1__notuninit() {
 }
 
 void test__QStringList__at__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::at(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::at(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -324,8 +324,8 @@ void test__QStringList__at__arg1__notuninit() {
 }
 
 void test__QString__capacity__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::capacity();
+  int x = 1;
+  if (cond) { x=100; result = QString::capacity(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -336,8 +336,8 @@ void test__QString__capacity__useretval() {
 }
 
 void test__QList__begin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::begin();
+  int x = 1;
+  if (cond) { x=100; result = QList::begin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -348,8 +348,8 @@ void test__QList__begin__useretval() {
 }
 
 void test__QList__end__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::end();
+  int x = 1;
+  if (cond) { x=100; result = QList::end(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -360,8 +360,8 @@ void test__QList__end__useretval() {
 }
 
 void test__QList__cbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::cbegin();
+  int x = 1;
+  if (cond) { x=100; result = QList::cbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -372,8 +372,8 @@ void test__QList__cbegin__useretval() {
 }
 
 void test__QList__cend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::cend();
+  int x = 1;
+  if (cond) { x=100; result = QList::cend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -384,8 +384,8 @@ void test__QList__cend__useretval() {
 }
 
 void test__QList__constBegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::constBegin();
+  int x = 1;
+  if (cond) { x=100; result = QList::constBegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -396,8 +396,8 @@ void test__QList__constBegin__useretval() {
 }
 
 void test__QList__constEnd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::constEnd();
+  int x = 1;
+  if (cond) { x=100; result = QList::constEnd(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -408,8 +408,8 @@ void test__QList__constEnd__useretval() {
 }
 
 void test__QList__rbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::rbegin();
+  int x = 1;
+  if (cond) { x=100; result = QList::rbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -420,8 +420,8 @@ void test__QList__rbegin__useretval() {
 }
 
 void test__QList__rend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::rend();
+  int x = 1;
+  if (cond) { x=100; result = QList::rend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -432,8 +432,8 @@ void test__QList__rend__useretval() {
 }
 
 void test__QList__crbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::crbegin();
+  int x = 1;
+  if (cond) { x=100; result = QList::crbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -444,8 +444,8 @@ void test__QList__crbegin__useretval() {
 }
 
 void test__QList__crend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::crend();
+  int x = 1;
+  if (cond) { x=100; result = QList::crend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -456,8 +456,8 @@ void test__QList__crend__useretval() {
 }
 
 void test__QString__begin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::begin();
+  int x = 1;
+  if (cond) { x=100; result = QString::begin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -468,8 +468,8 @@ void test__QString__begin__useretval() {
 }
 
 void test__QString__end__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::end();
+  int x = 1;
+  if (cond) { x=100; result = QString::end(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -480,8 +480,8 @@ void test__QString__end__useretval() {
 }
 
 void test__QString__cbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::cbegin();
+  int x = 1;
+  if (cond) { x=100; result = QString::cbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -492,8 +492,8 @@ void test__QString__cbegin__useretval() {
 }
 
 void test__QString__cend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::cend();
+  int x = 1;
+  if (cond) { x=100; result = QString::cend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -504,8 +504,8 @@ void test__QString__cend__useretval() {
 }
 
 void test__QString__constBegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::constBegin();
+  int x = 1;
+  if (cond) { x=100; result = QString::constBegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -516,8 +516,8 @@ void test__QString__constBegin__useretval() {
 }
 
 void test__QString__constEnd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::constEnd();
+  int x = 1;
+  if (cond) { x=100; result = QString::constEnd(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -528,8 +528,8 @@ void test__QString__constEnd__useretval() {
 }
 
 void test__QString__rbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::rbegin();
+  int x = 1;
+  if (cond) { x=100; result = QString::rbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -540,8 +540,8 @@ void test__QString__rbegin__useretval() {
 }
 
 void test__QString__rend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::rend();
+  int x = 1;
+  if (cond) { x=100; result = QString::rend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -552,8 +552,8 @@ void test__QString__rend__useretval() {
 }
 
 void test__QString__crbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::crbegin();
+  int x = 1;
+  if (cond) { x=100; result = QString::crbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -564,8 +564,8 @@ void test__QString__crbegin__useretval() {
 }
 
 void test__QString__crend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::crend();
+  int x = 1;
+  if (cond) { x=100; result = QString::crend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -576,8 +576,8 @@ void test__QString__crend__useretval() {
 }
 
 void test__QStringList__begin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::begin();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::begin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -588,8 +588,8 @@ void test__QStringList__begin__useretval() {
 }
 
 void test__QStringList__end__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::end();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::end(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -600,8 +600,8 @@ void test__QStringList__end__useretval() {
 }
 
 void test__QStringList__cbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::cbegin();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::cbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -612,8 +612,8 @@ void test__QStringList__cbegin__useretval() {
 }
 
 void test__QStringList__cend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::cend();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::cend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -624,8 +624,8 @@ void test__QStringList__cend__useretval() {
 }
 
 void test__QStringList__constBegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::constBegin();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::constBegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -636,8 +636,8 @@ void test__QStringList__constBegin__useretval() {
 }
 
 void test__QStringList__constEnd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::constEnd();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::constEnd(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -648,8 +648,8 @@ void test__QStringList__constEnd__useretval() {
 }
 
 void test__QStringList__rbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::rbegin();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::rbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -660,8 +660,8 @@ void test__QStringList__rbegin__useretval() {
 }
 
 void test__QStringList__rend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::rend();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::rend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -672,8 +672,8 @@ void test__QStringList__rend__useretval() {
 }
 
 void test__QStringList__crbegin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::crbegin();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::crbegin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -684,8 +684,8 @@ void test__QStringList__crbegin__useretval() {
 }
 
 void test__QStringList__crend__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::crend();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::crend(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -696,8 +696,8 @@ void test__QStringList__crend__useretval() {
 }
 
 void test__QString__chop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QString::chop(arg1);
+  int x = 1;
+  if (cond) { x=100; QString::chop(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -709,22 +709,22 @@ void test__QString__chop__arg1__notuninit() {
 }
 
 void test__QList__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QList::clear();
+  int x = 1;
+  if (cond) { x=100; QList::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__QString__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QString::clear();
+  int x = 1;
+  if (cond) { x=100; QString::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__QString__compare__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::compare(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QString::compare(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -759,8 +759,8 @@ void test__QString__compare__arg3__notuninit() {
 }
 
 void test__QList__contains__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::contains(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QList::contains(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -777,8 +777,8 @@ void test__QList__contains__arg1__notuninit() {
 }
 
 void test__QList__startsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::startsWith(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QList::startsWith(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -795,8 +795,8 @@ void test__QList__startsWith__arg1__notuninit() {
 }
 
 void test__QList__endsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::endsWith(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QList::endsWith(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -813,8 +813,8 @@ void test__QList__endsWith__arg1__notuninit() {
 }
 
 void test__QString__contains__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::contains(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QString::contains(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -837,8 +837,8 @@ void test__QString__contains__arg2__notuninit() {
 }
 
 void test__QString__startsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::startsWith(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QString::startsWith(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -861,8 +861,8 @@ void test__QString__startsWith__arg2__notuninit() {
 }
 
 void test__QString__endsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::endsWith(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QString::endsWith(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -885,8 +885,8 @@ void test__QString__endsWith__arg2__notuninit() {
 }
 
 void test__QStringList__contains__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::contains(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::contains(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -903,8 +903,8 @@ void test__QStringList__contains__arg1__notuninit() {
 }
 
 void test__QStringList__startsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::startsWith(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::startsWith(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -921,8 +921,8 @@ void test__QStringList__startsWith__arg1__notuninit() {
 }
 
 void test__QStringList__endsWith__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::endsWith(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::endsWith(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -939,8 +939,8 @@ void test__QStringList__endsWith__arg1__notuninit() {
 }
 
 void test__QList__count__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::count();
+  int x = 1;
+  if (cond) { x=100; result = QList::count(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -951,8 +951,8 @@ void test__QList__count__useretval() {
 }
 
 void test__QList__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::length();
+  int x = 1;
+  if (cond) { x=100; result = QList::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -963,8 +963,8 @@ void test__QList__length__useretval() {
 }
 
 void test__QList__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::size();
+  int x = 1;
+  if (cond) { x=100; result = QList::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -975,8 +975,8 @@ void test__QList__size__useretval() {
 }
 
 void test__QString__count__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::count();
+  int x = 1;
+  if (cond) { x=100; result = QString::count(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -987,8 +987,8 @@ void test__QString__count__useretval() {
 }
 
 void test__QString__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::length();
+  int x = 1;
+  if (cond) { x=100; result = QString::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -999,8 +999,8 @@ void test__QString__length__useretval() {
 }
 
 void test__QString__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::size();
+  int x = 1;
+  if (cond) { x=100; result = QString::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1011,8 +1011,8 @@ void test__QString__size__useretval() {
 }
 
 void test__QStringList__count__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::count();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::count(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1023,8 +1023,8 @@ void test__QStringList__count__useretval() {
 }
 
 void test__QStringList__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::length();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1035,8 +1035,8 @@ void test__QStringList__length__useretval() {
 }
 
 void test__QStringList__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::size();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1047,8 +1047,8 @@ void test__QStringList__size__useretval() {
 }
 
 void test__QList__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::empty();
+  int x = 1;
+  if (cond) { x=100; result = QList::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1059,8 +1059,8 @@ void test__QList__empty__useretval() {
 }
 
 void test__QList__isEmpty__QString__isEmpty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::isEmpty::QString::isEmpty();
+  int x = 1;
+  if (cond) { x=100; result = QList::isEmpty::QString::isEmpty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1071,8 +1071,8 @@ void test__QList__isEmpty__QString__isEmpty__useretval() {
 }
 
 void test__QString__isNull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::isNull();
+  int x = 1;
+  if (cond) { x=100; result = QString::isNull(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1083,8 +1083,8 @@ void test__QString__isNull__useretval() {
 }
 
 void test__QStringList__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::empty();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1095,8 +1095,8 @@ void test__QStringList__empty__useretval() {
 }
 
 void test__QStringList__isEmpty____noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::isEmpty::();
+  int x = 1;
+  if (cond) { x=100; result = QStringList::isEmpty::(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1107,8 +1107,8 @@ void test__QStringList__isEmpty____useretval() {
 }
 
 void test__QString__fromStdString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::fromStdString(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QString::fromStdString(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1119,8 +1119,8 @@ void test__QString__fromStdString__useretval() {
 }
 
 void test__QList__indexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::indexOf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QList::indexOf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1137,8 +1137,8 @@ void test__QList__indexOf__arg1__notuninit() {
 }
 
 void test__QStringList__indexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::indexOf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::indexOf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1155,8 +1155,8 @@ void test__QStringList__indexOf__arg1__notuninit() {
 }
 
 void test__QString__indexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::indexOf();
+  int x = 1;
+  if (cond) { x=100; result = QString::indexOf(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1167,8 +1167,8 @@ void test__QString__indexOf__useretval() {
 }
 
 void test__QString__isRightToLeft__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::isRightToLeft();
+  int x = 1;
+  if (cond) { x=100; result = QString::isRightToLeft(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1179,8 +1179,8 @@ void test__QString__isRightToLeft__useretval() {
 }
 
 void test__QList__lastIndexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::lastIndexOf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QList::lastIndexOf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1203,8 +1203,8 @@ void test__QList__lastIndexOf__arg2__notuninit() {
 }
 
 void test__QStringList__lastIndexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::lastIndexOf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::lastIndexOf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1227,8 +1227,8 @@ void test__QStringList__lastIndexOf__arg2__notuninit() {
 }
 
 void test__QString__lastIndexOf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::lastIndexOf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QString::lastIndexOf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1257,8 +1257,8 @@ void test__QString__lastIndexOf__arg3__notuninit() {
 }
 
 void test__QString__left__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::left(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QString::left(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1275,8 +1275,8 @@ void test__QString__left__arg1__notuninit() {
 }
 
 void test__QList__mid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QList::mid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QList::mid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1299,8 +1299,8 @@ void test__QList__mid__arg2__notuninit() {
 }
 
 void test__QString__mid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::mid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QString::mid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1323,8 +1323,8 @@ void test__QString__mid__arg2__notuninit() {
 }
 
 void test__QStringList__mid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QStringList::mid(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QStringList::mid(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1347,8 +1347,8 @@ void test__QStringList__mid__arg2__notuninit() {
 }
 
 void test__QString__number__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::number();
+  int x = 1;
+  if (cond) { x=100; result = QString::number(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1365,8 +1365,8 @@ void test__QString__number__leakignore() {
 }
 
 void test__QString__right__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::right(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QString::right(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1394,8 +1394,8 @@ void test__QString__right__arg1__notuninit() {
 }
 
 void test__QString__split__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::split(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QString::split(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1418,8 +1418,8 @@ void test__QString__split__arg1__notuninit() {
 }
 
 void test__QString__toInt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::toInt(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = QString::toInt(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1448,8 +1448,8 @@ void test__QString__toInt__arg2__notuninit() {
 }
 
 void test__QString__toLower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::toLower();
+  int x = 1;
+  if (cond) { x=100; result = QString::toLower(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1460,8 +1460,8 @@ void test__QString__toLower__useretval() {
 }
 
 void test__QString__toStdString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::toStdString();
+  int x = 1;
+  if (cond) { x=100; result = QString::toStdString(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1472,8 +1472,8 @@ void test__QString__toStdString__useretval() {
 }
 
 void test__QString__toUpper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::toUpper();
+  int x = 1;
+  if (cond) { x=100; result = QString::toUpper(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1484,8 +1484,8 @@ void test__QString__toUpper__useretval() {
 }
 
 void test__QString__toUtf8__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::toUtf8();
+  int x = 1;
+  if (cond) { x=100; result = QString::toUtf8(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1496,8 +1496,8 @@ void test__QString__toUtf8__useretval() {
 }
 
 void test__QString__trimmed__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QString::trimmed();
+  int x = 1;
+  if (cond) { x=100; result = QString::trimmed(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1508,8 +1508,8 @@ void test__QString__trimmed__useretval() {
 }
 
 void test__QMetaObject__connectSlotsByName__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QMetaObject::connectSlotsByName(arg1);
+  int x = 1;
+  if (cond) { x=100; QMetaObject::connectSlotsByName(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1526,8 +1526,8 @@ void test__QMetaObject__connectSlotsByName__arg1__notnull() {
 }
 
 void test__QDir__fromNativeSeparators__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QDir::fromNativeSeparators(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QDir::fromNativeSeparators(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1544,8 +1544,8 @@ void test__QDir__fromNativeSeparators__arg1__notuninit() {
 }
 
 void test__QDir__toNativeSeparators__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QDir::toNativeSeparators(arg1);
+  int x = 1;
+  if (cond) { x=100; result = QDir::toNativeSeparators(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1562,8 +1562,8 @@ void test__QDir__toNativeSeparators__arg1__notuninit() {
 }
 
 void test__QFile__open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QFile::open();
+  int x = 1;
+  if (cond) { x=100; QFile::open(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1575,8 +1575,8 @@ void test__QFile__open__leakignore() {
 }
 
 void test__QFile__remove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QFile::remove();
+  int x = 1;
+  if (cond) { x=100; QFile::remove(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1588,8 +1588,8 @@ void test__QFile__remove__leakignore() {
 }
 
 void test__QFile__rename__noreturn() {
-  int x = 100;
-  if (cond) x=1; else QFile::rename();
+  int x = 1;
+  if (cond) { x=100; QFile::rename(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1601,8 +1601,8 @@ void test__QFile__rename__leakignore() {
 }
 
 void test__QFile__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QFile::size();
+  int x = 1;
+  if (cond) { x=100; result = QFile::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1613,8 +1613,8 @@ void test__QFile__size__useretval() {
 }
 
 void test__QIODevice__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QIODevice::size();
+  int x = 1;
+  if (cond) { x=100; result = QIODevice::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-sdl.cpp b/test/cfg/generated-cfg-tests-sdl.cpp
index e6aadeaf3..60627e0da 100644
--- a/test/cfg/generated-cfg-tests-sdl.cpp
+++ b/test/cfg/generated-cfg-tests-sdl.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/sdl.cfg > generated-cfg-tests-sdl.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-sdl.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-sdl.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__SDL_mutexP__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SDL_mutexP(arg1);
+  int x = 1;
+  if (cond) { x=100; SDL_mutexP(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26,8 +26,8 @@ void test__SDL_mutexP__arg1__notnull() {
 }
 
 void test__SDL_mutexV__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SDL_mutexV(arg1);
+  int x = 1;
+  if (cond) { x=100; SDL_mutexV(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -43,8 +43,8 @@ void test__SDL_mutexV__arg1__notnull() {
 }
 
 void test__SDL_RWsize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SDL_RWsize(arg1);
+  int x = 1;
+  if (cond) { x=100; SDL_RWsize(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -60,8 +60,8 @@ void test__SDL_RWsize__arg1__notnull() {
 }
 
 void test__SDL_RWread__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SDL_RWread(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SDL_RWread(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -87,8 +87,8 @@ void test__SDL_RWread__arg2__notnull() {
 }
 
 void test__IMG_isPNG__noreturn() {
-  int x = 100;
-  if (cond) x=1; else IMG_isPNG(arg1);
+  int x = 1;
+  if (cond) { x=100; IMG_isPNG(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -104,8 +104,8 @@ void test__IMG_isPNG__arg1__notnull() {
 }
 
 void test__IMG_isJPG__noreturn() {
-  int x = 100;
-  if (cond) x=1; else IMG_isJPG(arg1);
+  int x = 1;
+  if (cond) { x=100; IMG_isJPG(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-sfml.cpp b/test/cfg/generated-cfg-tests-sfml.cpp
index 572cddc3c..e98d1b315 100644
--- a/test/cfg/generated-cfg-tests-sfml.cpp
+++ b/test/cfg/generated-cfg-tests-sfml.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/sfml.cfg > generated-cfg-tests-sfml.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-sfml.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-sfml.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__sf__err__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::err();
+  int x = 1;
+  if (cond) { x=100; result = sf::err(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27,8 +27,8 @@ void test__sf__err__leakignore() {
 }
 
 void test__sf__sleep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::sleep(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::sleep(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -46,8 +46,8 @@ void test__sf__sleep__arg1__notuninit() {
 }
 
 void test__sf__Time__asSeconds__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Time::asSeconds();
+  int x = 1;
+  if (cond) { x=100; result = sf::Time::asSeconds(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -64,8 +64,8 @@ void test__sf__Time__asSeconds__leakignore() {
 }
 
 void test__sf__Time__asMilliseconds__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Time::asMilliseconds();
+  int x = 1;
+  if (cond) { x=100; result = sf::Time::asMilliseconds(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -82,8 +82,8 @@ void test__sf__Time__asMilliseconds__leakignore() {
 }
 
 void test__sf__Time__asMicroseconds__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Time::asMicroseconds();
+  int x = 1;
+  if (cond) { x=100; result = sf::Time::asMicroseconds(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -100,8 +100,8 @@ void test__sf__Time__asMicroseconds__leakignore() {
 }
 
 void test__sf__String__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::String::clear();
+  int x = 1;
+  if (cond) { x=100; sf::String::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -113,8 +113,8 @@ void test__sf__String__clear__leakignore() {
 }
 
 void test__sf__String__isEmpty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::String::isEmpty();
+  int x = 1;
+  if (cond) { x=100; result = sf::String::isEmpty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -131,8 +131,8 @@ void test__sf__String__isEmpty__leakignore() {
 }
 
 void test__sf__String__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::String::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::String::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -149,8 +149,8 @@ void test__sf__String__getSize__leakignore() {
 }
 
 void test__sf__String__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::String::find(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sf::String::find(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -179,8 +179,8 @@ void test__sf__String__find__arg2__notuninit() {
 }
 
 void test__sf__String__substring__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::String::substring(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::String::substring(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -209,8 +209,8 @@ void test__sf__String__substring__arg2__notuninit() {
 }
 
 void test__sf__String__erase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::String::erase(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sf::String::erase(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -234,8 +234,8 @@ void test__sf__String__erase__arg2__notuninit() {
 }
 
 void test__sf__RenderTarget__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::clear(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::clear(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -253,8 +253,8 @@ void test__sf__RenderTarget__clear__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::clear(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::clear(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -272,8 +272,8 @@ void test__sf__RenderWindow__clear__arg1__notuninit() {
 }
 
 void test__sf__RenderTexture__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::clear(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::clear(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -291,8 +291,8 @@ void test__sf__RenderTexture__clear__arg1__notuninit() {
 }
 
 void test__sf__RenderTarget__setView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::setView(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::setView(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -310,8 +310,8 @@ void test__sf__RenderTarget__setView__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setView(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setView(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -329,8 +329,8 @@ void test__sf__RenderWindow__setView__arg1__notuninit() {
 }
 
 void test__sf__RenderTexture__setView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::setView(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::setView(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -348,8 +348,8 @@ void test__sf__RenderTexture__setView__arg1__notuninit() {
 }
 
 void test__sf__RenderTarget__getView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::getView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::getView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -366,8 +366,8 @@ void test__sf__RenderTarget__getView__leakignore() {
 }
 
 void test__sf__RenderTarget__getDefaultView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::getDefaultView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::getDefaultView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -384,8 +384,8 @@ void test__sf__RenderTarget__getDefaultView__leakignore() {
 }
 
 void test__sf__RenderWindow__getView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -402,8 +402,8 @@ void test__sf__RenderWindow__getView__leakignore() {
 }
 
 void test__sf__RenderWindow__getDefaultView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getDefaultView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getDefaultView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -420,8 +420,8 @@ void test__sf__RenderWindow__getDefaultView__leakignore() {
 }
 
 void test__sf__RenderTexture__getView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::getView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::getView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -438,8 +438,8 @@ void test__sf__RenderTexture__getView__leakignore() {
 }
 
 void test__sf__RenderTexture__getDefaultView__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::getDefaultView();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::getDefaultView(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -456,8 +456,8 @@ void test__sf__RenderTexture__getDefaultView__leakignore() {
 }
 
 void test__sf__RenderTarget__getViewport__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::getViewport(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::getViewport(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -480,8 +480,8 @@ void test__sf__RenderTarget__getViewport__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__getViewport__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getViewport(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getViewport(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -504,8 +504,8 @@ void test__sf__RenderWindow__getViewport__arg1__notuninit() {
 }
 
 void test__sf__RenderTexture__getViewport__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::getViewport(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::getViewport(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -528,8 +528,8 @@ void test__sf__RenderTexture__getViewport__arg1__notuninit() {
 }
 
 void test__sf__RenderTarget__mapPixelToCoords__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::mapPixelToCoords(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::mapPixelToCoords(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -558,8 +558,8 @@ void test__sf__RenderTarget__mapPixelToCoords__arg2__notuninit() {
 }
 
 void test__sf__RenderTarget__mapCoordsToPixel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::mapCoordsToPixel(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::mapCoordsToPixel(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -588,8 +588,8 @@ void test__sf__RenderTarget__mapCoordsToPixel__arg2__notuninit() {
 }
 
 void test__sf__RenderWindow__mapPixelToCoords__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::mapPixelToCoords(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::mapPixelToCoords(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -618,8 +618,8 @@ void test__sf__RenderWindow__mapPixelToCoords__arg2__notuninit() {
 }
 
 void test__sf__RenderWindow__mapCoordsToPixel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::mapCoordsToPixel(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::mapCoordsToPixel(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -648,8 +648,8 @@ void test__sf__RenderWindow__mapCoordsToPixel__arg2__notuninit() {
 }
 
 void test__sf__RenderTexture__mapPixelToCoords__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::mapPixelToCoords(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::mapPixelToCoords(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -678,8 +678,8 @@ void test__sf__RenderTexture__mapPixelToCoords__arg2__notuninit() {
 }
 
 void test__sf__RenderTexture__mapCoordsToPixel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::mapCoordsToPixel(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::mapCoordsToPixel(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -708,8 +708,8 @@ void test__sf__RenderTexture__mapCoordsToPixel__arg2__notuninit() {
 }
 
 void test__sf__RenderTarget__draw__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::draw(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::draw(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -745,8 +745,8 @@ void test__sf__RenderTarget__draw__arg4__notuninit() {
 }
 
 void test__sf__RenderWindow__draw__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::draw(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::draw(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -782,8 +782,8 @@ void test__sf__RenderWindow__draw__arg4__notuninit() {
 }
 
 void test__sf__RenderTexture__draw__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::draw(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::draw(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -819,8 +819,8 @@ void test__sf__RenderTexture__draw__arg4__notuninit() {
 }
 
 void test__sf__RenderTarget__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTarget::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTarget::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -837,8 +837,8 @@ void test__sf__RenderTarget__getSize__leakignore() {
 }
 
 void test__sf__RenderWindow__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -855,8 +855,8 @@ void test__sf__RenderWindow__getSize__leakignore() {
 }
 
 void test__sf__RenderTexture__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderTexture::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderTexture::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -873,8 +873,8 @@ void test__sf__RenderTexture__getSize__leakignore() {
 }
 
 void test__sf__RenderTarget__setActive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::setActive(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::setActive(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -892,8 +892,8 @@ void test__sf__RenderTarget__setActive__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setActive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setActive(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setActive(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -911,8 +911,8 @@ void test__sf__RenderWindow__setActive__arg1__notuninit() {
 }
 
 void test__sf__RenderTexture__setActive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::setActive(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::setActive(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -930,8 +930,8 @@ void test__sf__RenderTexture__setActive__arg1__notuninit() {
 }
 
 void test__sf__Window__setActive__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setActive(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setActive(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -949,8 +949,8 @@ void test__sf__Window__setActive__arg1__notuninit() {
 }
 
 void test__sf__RenderTarget__pushGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::pushGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::pushGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -962,8 +962,8 @@ void test__sf__RenderTarget__pushGLStates__leakignore() {
 }
 
 void test__sf__RenderTarget__popGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::popGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::popGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -975,8 +975,8 @@ void test__sf__RenderTarget__popGLStates__leakignore() {
 }
 
 void test__sf__RenderTarget__resetGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTarget::resetGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTarget::resetGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -988,8 +988,8 @@ void test__sf__RenderTarget__resetGLStates__leakignore() {
 }
 
 void test__sf__RenderWindow__pushGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::pushGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::pushGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1001,8 +1001,8 @@ void test__sf__RenderWindow__pushGLStates__leakignore() {
 }
 
 void test__sf__RenderWindow__popGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::popGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::popGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1014,8 +1014,8 @@ void test__sf__RenderWindow__popGLStates__leakignore() {
 }
 
 void test__sf__RenderWindow__resetGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::resetGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::resetGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1027,8 +1027,8 @@ void test__sf__RenderWindow__resetGLStates__leakignore() {
 }
 
 void test__sf__RenderTexture__pushGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::pushGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::pushGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1040,8 +1040,8 @@ void test__sf__RenderTexture__pushGLStates__leakignore() {
 }
 
 void test__sf__RenderTexture__popGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::popGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::popGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1053,8 +1053,8 @@ void test__sf__RenderTexture__popGLStates__leakignore() {
 }
 
 void test__sf__RenderTexture__resetGLStates__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderTexture::resetGLStates();
+  int x = 1;
+  if (cond) { x=100; sf::RenderTexture::resetGLStates(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1066,8 +1066,8 @@ void test__sf__RenderTexture__resetGLStates__leakignore() {
 }
 
 void test__sf__Window__create__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::create(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; sf::Window::create(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1103,8 +1103,8 @@ void test__sf__Window__create__arg4__notuninit() {
 }
 
 void test__sf__RenderWindow__create__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::create(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::create(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1140,8 +1140,8 @@ void test__sf__RenderWindow__create__arg4__notuninit() {
 }
 
 void test__sf__Window__close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::close();
+  int x = 1;
+  if (cond) { x=100; sf::Window::close(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1153,8 +1153,8 @@ void test__sf__Window__close__leakignore() {
 }
 
 void test__sf__RenderWindow__close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::close();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::close(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1166,8 +1166,8 @@ void test__sf__RenderWindow__close__leakignore() {
 }
 
 void test__sf__Window__isOpen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::isOpen();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::isOpen(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1184,8 +1184,8 @@ void test__sf__Window__isOpen__leakignore() {
 }
 
 void test__sf__RenderWindow__isOpen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::isOpen();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::isOpen(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1202,8 +1202,8 @@ void test__sf__RenderWindow__isOpen__leakignore() {
 }
 
 void test__sf__Window__getSettings__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::getSettings();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::getSettings(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1220,8 +1220,8 @@ void test__sf__Window__getSettings__leakignore() {
 }
 
 void test__sf__RenderWindow__getSettings__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getSettings();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getSettings(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1238,8 +1238,8 @@ void test__sf__RenderWindow__getSettings__leakignore() {
 }
 
 void test__sf__Window__pollEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::pollEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::pollEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1251,8 +1251,8 @@ void test__sf__Window__pollEvent__leakignore() {
 }
 
 void test__sf__Window__waitEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::waitEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::waitEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1264,8 +1264,8 @@ void test__sf__Window__waitEvent__leakignore() {
 }
 
 void test__sf__RenderWindow__pollEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::pollEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::pollEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1277,8 +1277,8 @@ void test__sf__RenderWindow__pollEvent__leakignore() {
 }
 
 void test__sf__RenderWindow__waitEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::waitEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::waitEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1290,8 +1290,8 @@ void test__sf__RenderWindow__waitEvent__leakignore() {
 }
 
 void test__sf__Window__getPosition__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::getPosition();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::getPosition(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1308,8 +1308,8 @@ void test__sf__Window__getPosition__leakignore() {
 }
 
 void test__sf__RenderWindow__getPosition__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getPosition();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getPosition(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1326,8 +1326,8 @@ void test__sf__RenderWindow__getPosition__leakignore() {
 }
 
 void test__sf__Window__setPosition__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setPosition(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setPosition(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1345,8 +1345,8 @@ void test__sf__Window__setPosition__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setPosition__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setPosition(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setPosition(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1364,8 +1364,8 @@ void test__sf__RenderWindow__setPosition__arg1__notuninit() {
 }
 
 void test__sf__Window__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1382,8 +1382,8 @@ void test__sf__Window__getSize__leakignore() {
 }
 
 void test__sf__RenderWindow__getSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getSize();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1400,8 +1400,8 @@ void test__sf__RenderWindow__getSize__leakignore() {
 }
 
 void test__sf__Window__setSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setSize(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setSize(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1419,8 +1419,8 @@ void test__sf__Window__setSize__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setSize(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setSize(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1438,8 +1438,8 @@ void test__sf__RenderWindow__setSize__arg1__notuninit() {
 }
 
 void test__sf__Window__setTitle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setTitle(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setTitle(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1457,8 +1457,8 @@ void test__sf__Window__setTitle__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setTitle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setTitle(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setTitle(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1476,8 +1476,8 @@ void test__sf__RenderWindow__setTitle__arg1__notuninit() {
 }
 
 void test__sf__Window__setIcon__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setIcon(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setIcon(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1512,8 +1512,8 @@ void test__sf__Window__setIcon__arg3__notuninit() {
 }
 
 void test__sf__RenderWindow__setIcon__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setIcon(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setIcon(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1548,8 +1548,8 @@ void test__sf__RenderWindow__setIcon__arg3__notuninit() {
 }
 
 void test__sf__Window__setVisible__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setVisible(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setVisible(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1567,8 +1567,8 @@ void test__sf__Window__setVisible__arg1__notuninit() {
 }
 
 void test__sf__Window__setVerticalSyncEnabled__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setVerticalSyncEnabled(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setVerticalSyncEnabled(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1586,8 +1586,8 @@ void test__sf__Window__setVerticalSyncEnabled__arg1__notuninit() {
 }
 
 void test__sf__Window__setMouseCursorVisible__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setMouseCursorVisible(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setMouseCursorVisible(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1605,8 +1605,8 @@ void test__sf__Window__setMouseCursorVisible__arg1__notuninit() {
 }
 
 void test__sf__Window__setMouseCursorGrabbed__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setMouseCursorGrabbed(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setMouseCursorGrabbed(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1624,8 +1624,8 @@ void test__sf__Window__setMouseCursorGrabbed__arg1__notuninit() {
 }
 
 void test__sf__Window__setKeyRepeatEnabled__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setKeyRepeatEnabled(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setKeyRepeatEnabled(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1643,8 +1643,8 @@ void test__sf__Window__setKeyRepeatEnabled__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setVisible__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setVisible(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setVisible(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1662,8 +1662,8 @@ void test__sf__RenderWindow__setVisible__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setVerticalSyncEnabled__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setVerticalSyncEnabled(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setVerticalSyncEnabled(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1681,8 +1681,8 @@ void test__sf__RenderWindow__setVerticalSyncEnabled__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setMouseCursorVisible__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setMouseCursorVisible(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setMouseCursorVisible(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1700,8 +1700,8 @@ void test__sf__RenderWindow__setMouseCursorVisible__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setMouseCursorGrabbed__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setMouseCursorGrabbed(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setMouseCursorGrabbed(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1719,8 +1719,8 @@ void test__sf__RenderWindow__setMouseCursorGrabbed__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setKeyRepeatEnabled__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setKeyRepeatEnabled(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setKeyRepeatEnabled(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1738,8 +1738,8 @@ void test__sf__RenderWindow__setKeyRepeatEnabled__arg1__notuninit() {
 }
 
 void test__sf__Window__setFramerateLimit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setFramerateLimit(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setFramerateLimit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1757,8 +1757,8 @@ void test__sf__Window__setFramerateLimit__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setFramerateLimit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setFramerateLimit(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setFramerateLimit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1776,8 +1776,8 @@ void test__sf__RenderWindow__setFramerateLimit__arg1__notuninit() {
 }
 
 void test__sf__Window__setJoystickThreshold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::setJoystickThreshold(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::Window::setJoystickThreshold(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1795,8 +1795,8 @@ void test__sf__Window__setJoystickThreshold__arg1__notuninit() {
 }
 
 void test__sf__RenderWindow__setJoystickThreshold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::setJoystickThreshold(arg1);
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::setJoystickThreshold(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1814,8 +1814,8 @@ void test__sf__RenderWindow__setJoystickThreshold__arg1__notuninit() {
 }
 
 void test__sf__Window__requestFocus__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::requestFocus();
+  int x = 1;
+  if (cond) { x=100; sf::Window::requestFocus(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1827,8 +1827,8 @@ void test__sf__Window__requestFocus__leakignore() {
 }
 
 void test__sf__RenderWindow__requestFocus__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::requestFocus();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::requestFocus(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1840,8 +1840,8 @@ void test__sf__RenderWindow__requestFocus__leakignore() {
 }
 
 void test__sf__Window__hasFocus__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::hasFocus();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::hasFocus(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1858,8 +1858,8 @@ void test__sf__Window__hasFocus__leakignore() {
 }
 
 void test__sf__RenderWindow__hasFocus__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::hasFocus();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::hasFocus(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1876,8 +1876,8 @@ void test__sf__RenderWindow__hasFocus__leakignore() {
 }
 
 void test__sf__Window__display__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::Window::display();
+  int x = 1;
+  if (cond) { x=100; sf::Window::display(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1889,8 +1889,8 @@ void test__sf__Window__display__leakignore() {
 }
 
 void test__sf__RenderWindow__display__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sf::RenderWindow::display();
+  int x = 1;
+  if (cond) { x=100; sf::RenderWindow::display(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1902,8 +1902,8 @@ void test__sf__RenderWindow__display__leakignore() {
 }
 
 void test__sf__Window__getSystemHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::Window::getSystemHandle();
+  int x = 1;
+  if (cond) { x=100; result = sf::Window::getSystemHandle(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1920,8 +1920,8 @@ void test__sf__Window__getSystemHandle__leakignore() {
 }
 
 void test__sf__RenderWindow__getSystemHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sf::RenderWindow::getSystemHandle();
+  int x = 1;
+  if (cond) { x=100; result = sf::RenderWindow::getSystemHandle(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-std.cpp b/test/cfg/generated-cfg-tests-std.cpp
index 834194135..1eac5ba61 100644
--- a/test/cfg/generated-cfg-tests-std.cpp
+++ b/test/cfg/generated-cfg-tests-std.cpp
@@ -4,27 +4,27 @@
 // ./generate_cfg_tests cfg/std.cfg > generated-cfg-tests-std.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-std.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-std.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__abort__noreturn() {
-  int x = 100;
-  if (cond) x=1; else abort();
+  int x = 1;
+  if (cond) { x=100; abort(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__abort__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::abort();
+  int x = 1;
+  if (cond) { x=100; std::abort(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__abs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = abs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = abs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -57,8 +57,8 @@ void test__abs__arg1__notuninit() {
 }
 
 void test__std__abs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::abs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::abs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -91,8 +91,8 @@ void test__std__abs__arg1__notuninit() {
 }
 
 void test__imaxabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = imaxabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = imaxabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -120,8 +120,8 @@ void test__imaxabs__arg1__notuninit() {
 }
 
 void test__std__imaxabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::imaxabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::imaxabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -149,8 +149,8 @@ void test__std__imaxabs__arg1__notuninit() {
 }
 
 void test__std__proj__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::proj(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::proj(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -178,8 +178,8 @@ void test__std__proj__arg1__notuninit() {
 }
 
 void test__cproj__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cproj(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cproj(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -207,8 +207,8 @@ void test__cproj__arg1__notuninit() {
 }
 
 void test__cprojf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cprojf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cprojf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -236,8 +236,8 @@ void test__cprojf__arg1__notuninit() {
 }
 
 void test__cprojl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cprojl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cprojl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -265,8 +265,8 @@ void test__cprojl__arg1__notuninit() {
 }
 
 void test__creal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = creal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = creal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -294,8 +294,8 @@ void test__creal__arg1__notuninit() {
 }
 
 void test__crealf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = crealf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = crealf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -323,8 +323,8 @@ void test__crealf__arg1__notuninit() {
 }
 
 void test__creall__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = creall(arg1);
+  int x = 1;
+  if (cond) { x=100; result = creall(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -352,8 +352,8 @@ void test__creall__arg1__notuninit() {
 }
 
 void test__acos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -381,8 +381,8 @@ void test__acos__arg1__notuninit() {
 }
 
 void test__std__acos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -410,8 +410,8 @@ void test__std__acos__arg1__notuninit() {
 }
 
 void test__acosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -439,8 +439,8 @@ void test__acosf__arg1__notuninit() {
 }
 
 void test__std__acosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -468,8 +468,8 @@ void test__std__acosf__arg1__notuninit() {
 }
 
 void test__acosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -497,8 +497,8 @@ void test__acosl__arg1__notuninit() {
 }
 
 void test__std__acosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -526,8 +526,8 @@ void test__std__acosl__arg1__notuninit() {
 }
 
 void test__acosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -555,8 +555,8 @@ void test__acosh__arg1__notuninit() {
 }
 
 void test__std__acosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -584,8 +584,8 @@ void test__std__acosh__arg1__notuninit() {
 }
 
 void test__acoshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acoshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acoshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -613,8 +613,8 @@ void test__acoshf__arg1__notuninit() {
 }
 
 void test__std__acoshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acoshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acoshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -642,8 +642,8 @@ void test__std__acoshf__arg1__notuninit() {
 }
 
 void test__acoshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = acoshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = acoshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -671,8 +671,8 @@ void test__acoshl__arg1__notuninit() {
 }
 
 void test__std__acoshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::acoshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::acoshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -700,8 +700,8 @@ void test__std__acoshl__arg1__notuninit() {
 }
 
 void test__asctime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asctime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asctime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -729,8 +729,8 @@ void test__asctime__arg1__notuninit() {
 }
 
 void test__std__asctime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asctime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asctime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -770,8 +770,8 @@ void test__assert__arg1__notuninit() {
 }
 
 void test__sqrt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sqrt(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sqrt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -799,8 +799,8 @@ void test__sqrt__arg1__notuninit() {
 }
 
 void test__std__sqrt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sqrt(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sqrt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -828,8 +828,8 @@ void test__std__sqrt__arg1__notuninit() {
 }
 
 void test__sqrtf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sqrtf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sqrtf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -857,8 +857,8 @@ void test__sqrtf__arg1__notuninit() {
 }
 
 void test__std__sqrtf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sqrtf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sqrtf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -886,8 +886,8 @@ void test__std__sqrtf__arg1__notuninit() {
 }
 
 void test__sqrtl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sqrtl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sqrtl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -915,8 +915,8 @@ void test__sqrtl__arg1__notuninit() {
 }
 
 void test__std__sqrtl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sqrtl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sqrtl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -944,8 +944,8 @@ void test__std__sqrtl__arg1__notuninit() {
 }
 
 void test__csqrt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csqrt(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csqrt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -973,8 +973,8 @@ void test__csqrt__arg1__notuninit() {
 }
 
 void test__csqrtf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csqrtf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csqrtf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1002,8 +1002,8 @@ void test__csqrtf__arg1__notuninit() {
 }
 
 void test__csqrtl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csqrtl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csqrtl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1031,8 +1031,8 @@ void test__csqrtl__arg1__notuninit() {
 }
 
 void test__sinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1060,8 +1060,8 @@ void test__sinh__arg1__notuninit() {
 }
 
 void test__std__sinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1089,8 +1089,8 @@ void test__std__sinh__arg1__notuninit() {
 }
 
 void test__sinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1118,8 +1118,8 @@ void test__sinhf__arg1__notuninit() {
 }
 
 void test__std__sinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1147,8 +1147,8 @@ void test__std__sinhf__arg1__notuninit() {
 }
 
 void test__sinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1176,8 +1176,8 @@ void test__sinhl__arg1__notuninit() {
 }
 
 void test__std__sinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1205,8 +1205,8 @@ void test__std__sinhl__arg1__notuninit() {
 }
 
 void test__sin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1234,8 +1234,8 @@ void test__sin__arg1__notuninit() {
 }
 
 void test__std__sin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1263,8 +1263,8 @@ void test__std__sin__arg1__notuninit() {
 }
 
 void test__sinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1292,8 +1292,8 @@ void test__sinf__arg1__notuninit() {
 }
 
 void test__std__sinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1321,8 +1321,8 @@ void test__std__sinf__arg1__notuninit() {
 }
 
 void test__sinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = sinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = sinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1350,8 +1350,8 @@ void test__sinl__arg1__notuninit() {
 }
 
 void test__std__sinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::sinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::sinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1379,8 +1379,8 @@ void test__std__sinl__arg1__notuninit() {
 }
 
 void test__csin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1408,8 +1408,8 @@ void test__csin__arg1__notuninit() {
 }
 
 void test__csinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1437,8 +1437,8 @@ void test__csinf__arg1__notuninit() {
 }
 
 void test__csinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1466,8 +1466,8 @@ void test__csinl__arg1__notuninit() {
 }
 
 void test__csinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1495,8 +1495,8 @@ void test__csinh__arg1__notuninit() {
 }
 
 void test__csinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1524,8 +1524,8 @@ void test__csinhf__arg1__notuninit() {
 }
 
 void test__csinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = csinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = csinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1553,8 +1553,8 @@ void test__csinhl__arg1__notuninit() {
 }
 
 void test__asin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1582,8 +1582,8 @@ void test__asin__arg1__notuninit() {
 }
 
 void test__std__asin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1611,8 +1611,8 @@ void test__std__asin__arg1__notuninit() {
 }
 
 void test__asinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1640,8 +1640,8 @@ void test__asinf__arg1__notuninit() {
 }
 
 void test__std__asinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1669,8 +1669,8 @@ void test__std__asinf__arg1__notuninit() {
 }
 
 void test__asinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1698,8 +1698,8 @@ void test__asinl__arg1__notuninit() {
 }
 
 void test__std__asinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1727,8 +1727,8 @@ void test__std__asinl__arg1__notuninit() {
 }
 
 void test__casin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casin(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casin(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1756,8 +1756,8 @@ void test__casin__arg1__notuninit() {
 }
 
 void test__casinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1785,8 +1785,8 @@ void test__casinf__arg1__notuninit() {
 }
 
 void test__casinl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casinl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casinl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1814,8 +1814,8 @@ void test__casinl__arg1__notuninit() {
 }
 
 void test__asinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1843,8 +1843,8 @@ void test__asinh__arg1__notuninit() {
 }
 
 void test__std__asinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1872,8 +1872,8 @@ void test__std__asinh__arg1__notuninit() {
 }
 
 void test__asinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1901,8 +1901,8 @@ void test__asinhf__arg1__notuninit() {
 }
 
 void test__std__asinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1930,8 +1930,8 @@ void test__std__asinhf__arg1__notuninit() {
 }
 
 void test__asinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = asinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = asinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1959,8 +1959,8 @@ void test__asinhl__arg1__notuninit() {
 }
 
 void test__std__asinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::asinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::asinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1988,8 +1988,8 @@ void test__std__asinhl__arg1__notuninit() {
 }
 
 void test__casinh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casinh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casinh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2017,8 +2017,8 @@ void test__casinh__arg1__notuninit() {
 }
 
 void test__casinhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casinhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casinhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2046,8 +2046,8 @@ void test__casinhf__arg1__notuninit() {
 }
 
 void test__casinhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = casinhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = casinhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2075,8 +2075,8 @@ void test__casinhl__arg1__notuninit() {
 }
 
 void test__wcsftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsftime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; wcsftime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2126,8 +2126,8 @@ void test__wcsftime__arg4__notuninit() {
 }
 
 void test__std__wcsftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcsftime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::wcsftime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2177,8 +2177,8 @@ void test__std__wcsftime__arg4__notuninit() {
 }
 
 void test__tan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2206,8 +2206,8 @@ void test__tan__arg1__notuninit() {
 }
 
 void test__std__tan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2235,8 +2235,8 @@ void test__std__tan__arg1__notuninit() {
 }
 
 void test__tanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2264,8 +2264,8 @@ void test__tanf__arg1__notuninit() {
 }
 
 void test__std__tanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2293,8 +2293,8 @@ void test__std__tanf__arg1__notuninit() {
 }
 
 void test__tanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2322,8 +2322,8 @@ void test__tanl__arg1__notuninit() {
 }
 
 void test__std__tanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2351,8 +2351,8 @@ void test__std__tanl__arg1__notuninit() {
 }
 
 void test__ctan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2380,8 +2380,8 @@ void test__ctan__arg1__notuninit() {
 }
 
 void test__ctanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2409,8 +2409,8 @@ void test__ctanf__arg1__notuninit() {
 }
 
 void test__ctanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2438,8 +2438,8 @@ void test__ctanl__arg1__notuninit() {
 }
 
 void test__tanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2467,8 +2467,8 @@ void test__tanh__arg1__notuninit() {
 }
 
 void test__std__tanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2496,8 +2496,8 @@ void test__std__tanh__arg1__notuninit() {
 }
 
 void test__tanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2525,8 +2525,8 @@ void test__tanhf__arg1__notuninit() {
 }
 
 void test__std__tanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2554,8 +2554,8 @@ void test__std__tanhf__arg1__notuninit() {
 }
 
 void test__tanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2583,8 +2583,8 @@ void test__tanhl__arg1__notuninit() {
 }
 
 void test__std__tanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2612,8 +2612,8 @@ void test__std__tanhl__arg1__notuninit() {
 }
 
 void test__ctanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2641,8 +2641,8 @@ void test__ctanh__arg1__notuninit() {
 }
 
 void test__ctanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2670,8 +2670,8 @@ void test__ctanhf__arg1__notuninit() {
 }
 
 void test__ctanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2699,8 +2699,8 @@ void test__ctanhl__arg1__notuninit() {
 }
 
 void test__feclearexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else feclearexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; feclearexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2723,8 +2723,8 @@ void test__feclearexcept__arg1__notuninit() {
 }
 
 void test__std__feclearexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::feclearexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; std::feclearexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2747,8 +2747,8 @@ void test__std__feclearexcept__arg1__notuninit() {
 }
 
 void test__fegetenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fegetenv(arg1);
+  int x = 1;
+  if (cond) { x=100; fegetenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2765,8 +2765,8 @@ void test__fegetenv__arg1__notnull() {
 }
 
 void test__std__fegetenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fegetenv(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fegetenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2783,8 +2783,8 @@ void test__std__fegetenv__arg1__notnull() {
 }
 
 void test__fegetexceptflag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fegetexceptflag(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fegetexceptflag(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2807,8 +2807,8 @@ void test__fegetexceptflag__arg2__notuninit() {
 }
 
 void test__std__fegetexceptflag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fegetexceptflag(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fegetexceptflag(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2831,8 +2831,8 @@ void test__std__fegetexceptflag__arg2__notuninit() {
 }
 
 void test__fegetround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fegetround();
+  int x = 1;
+  if (cond) { x=100; result = fegetround(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2854,8 +2854,8 @@ void test__fegetround__leakignore() {
 }
 
 void test__std__fegetround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fegetround();
+  int x = 1;
+  if (cond) { x=100; result = std::fegetround(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2877,8 +2877,8 @@ void test__std__fegetround__leakignore() {
 }
 
 void test__feholdexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else feholdexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; feholdexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2895,8 +2895,8 @@ void test__feholdexcept__arg1__notnull() {
 }
 
 void test__std__feholdexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::feholdexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; std::feholdexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2913,8 +2913,8 @@ void test__std__feholdexcept__arg1__notnull() {
 }
 
 void test__feraiseexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else feraiseexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; feraiseexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2932,8 +2932,8 @@ void test__feraiseexcept__arg1__notuninit() {
 }
 
 void test__std__feraiseexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::feraiseexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; std::feraiseexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2951,8 +2951,8 @@ void test__std__feraiseexcept__arg1__notuninit() {
 }
 
 void test__fesetenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fesetenv(arg1);
+  int x = 1;
+  if (cond) { x=100; fesetenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2975,8 +2975,8 @@ void test__fesetenv__arg1__notuninit() {
 }
 
 void test__std__fesetenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fesetenv(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fesetenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2999,8 +2999,8 @@ void test__std__fesetenv__arg1__notuninit() {
 }
 
 void test__fesetexceptflag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fesetexceptflag(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fesetexceptflag(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3029,8 +3029,8 @@ void test__fesetexceptflag__arg2__notuninit() {
 }
 
 void test__std__fesetexceptflag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fesetexceptflag(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fesetexceptflag(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3059,8 +3059,8 @@ void test__std__fesetexceptflag__arg2__notuninit() {
 }
 
 void test__fesetround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fesetround(arg1);
+  int x = 1;
+  if (cond) { x=100; fesetround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3078,8 +3078,8 @@ void test__fesetround__arg1__notuninit() {
 }
 
 void test__std__fesetround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fesetround(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fesetround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3097,8 +3097,8 @@ void test__std__fesetround__arg1__notuninit() {
 }
 
 void test__fetestexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fetestexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; fetestexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3116,8 +3116,8 @@ void test__fetestexcept__arg1__notuninit() {
 }
 
 void test__std__fetestexcept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fetestexcept(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fetestexcept(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3135,8 +3135,8 @@ void test__std__fetestexcept__arg1__notuninit() {
 }
 
 void test__feupdateenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else feupdateenv(arg1);
+  int x = 1;
+  if (cond) { x=100; feupdateenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3159,8 +3159,8 @@ void test__feupdateenv__arg1__notuninit() {
 }
 
 void test__std__feupdateenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::feupdateenv(arg1);
+  int x = 1;
+  if (cond) { x=100; std::feupdateenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3183,8 +3183,8 @@ void test__std__feupdateenv__arg1__notuninit() {
 }
 
 void test__atan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3212,8 +3212,8 @@ void test__atan__arg1__notuninit() {
 }
 
 void test__std__atan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3241,8 +3241,8 @@ void test__std__atan__arg1__notuninit() {
 }
 
 void test__atanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3270,8 +3270,8 @@ void test__atanf__arg1__notuninit() {
 }
 
 void test__std__atanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3299,8 +3299,8 @@ void test__std__atanf__arg1__notuninit() {
 }
 
 void test__atanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3328,8 +3328,8 @@ void test__atanl__arg1__notuninit() {
 }
 
 void test__std__atanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3357,8 +3357,8 @@ void test__std__atanl__arg1__notuninit() {
 }
 
 void test__catan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3386,8 +3386,8 @@ void test__catan__arg1__notuninit() {
 }
 
 void test__catanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3415,8 +3415,8 @@ void test__catanf__arg1__notuninit() {
 }
 
 void test__catanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3444,8 +3444,8 @@ void test__catanl__arg1__notuninit() {
 }
 
 void test__tgamma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tgamma(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tgamma(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3473,8 +3473,8 @@ void test__tgamma__arg1__notuninit() {
 }
 
 void test__std__tgamma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tgamma(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tgamma(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3502,8 +3502,8 @@ void test__std__tgamma__arg1__notuninit() {
 }
 
 void test__tgammaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tgammaf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tgammaf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3531,8 +3531,8 @@ void test__tgammaf__arg1__notuninit() {
 }
 
 void test__std__tgammaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tgammaf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tgammaf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3560,8 +3560,8 @@ void test__std__tgammaf__arg1__notuninit() {
 }
 
 void test__tgammal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tgammal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tgammal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3589,8 +3589,8 @@ void test__tgammal__arg1__notuninit() {
 }
 
 void test__std__tgammal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tgammal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tgammal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3618,8 +3618,8 @@ void test__std__tgammal__arg1__notuninit() {
 }
 
 void test__trunc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = trunc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = trunc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3647,8 +3647,8 @@ void test__trunc__arg1__notuninit() {
 }
 
 void test__std__trunc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::trunc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::trunc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3676,8 +3676,8 @@ void test__std__trunc__arg1__notuninit() {
 }
 
 void test__truncf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = truncf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = truncf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3705,8 +3705,8 @@ void test__truncf__arg1__notuninit() {
 }
 
 void test__std__truncf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::truncf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::truncf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3734,8 +3734,8 @@ void test__std__truncf__arg1__notuninit() {
 }
 
 void test__truncl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = truncl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = truncl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3763,8 +3763,8 @@ void test__truncl__arg1__notuninit() {
 }
 
 void test__std__truncl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::truncl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::truncl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3792,8 +3792,8 @@ void test__std__truncl__arg1__notuninit() {
 }
 
 void test__atanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3821,8 +3821,8 @@ void test__atanh__arg1__notuninit() {
 }
 
 void test__std__atanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3850,8 +3850,8 @@ void test__std__atanh__arg1__notuninit() {
 }
 
 void test__atanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3879,8 +3879,8 @@ void test__atanhf__arg1__notuninit() {
 }
 
 void test__std__atanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3908,8 +3908,8 @@ void test__std__atanhf__arg1__notuninit() {
 }
 
 void test__atanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3937,8 +3937,8 @@ void test__atanhl__arg1__notuninit() {
 }
 
 void test__std__atanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3966,8 +3966,8 @@ void test__std__atanhl__arg1__notuninit() {
 }
 
 void test__catanh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catanh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catanh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3995,8 +3995,8 @@ void test__catanh__arg1__notuninit() {
 }
 
 void test__catanhf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catanhf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catanhf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4024,8 +4024,8 @@ void test__catanhf__arg1__notuninit() {
 }
 
 void test__catanhl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = catanhl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = catanhl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4053,8 +4053,8 @@ void test__catanhl__arg1__notuninit() {
 }
 
 void test__atan2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atan2(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = atan2(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4088,8 +4088,8 @@ void test__atan2__arg2__notuninit() {
 }
 
 void test__std__atan2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atan2(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::atan2(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4123,8 +4123,8 @@ void test__std__atan2__arg2__notuninit() {
 }
 
 void test__atan2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atan2f(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = atan2f(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4158,8 +4158,8 @@ void test__atan2f__arg2__notuninit() {
 }
 
 void test__std__atan2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atan2f(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::atan2f(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4193,8 +4193,8 @@ void test__std__atan2f__arg2__notuninit() {
 }
 
 void test__atan2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atan2l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = atan2l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4228,8 +4228,8 @@ void test__atan2l__arg2__notuninit() {
 }
 
 void test__std__atan2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atan2l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::atan2l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4263,8 +4263,8 @@ void test__std__atan2l__arg2__notuninit() {
 }
 
 void test__atexit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else atexit(arg1);
+  int x = 1;
+  if (cond) { x=100; atexit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4286,8 +4286,8 @@ void test__atexit__arg1__notnull() {
 }
 
 void test__std__atexit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::atexit(arg1);
+  int x = 1;
+  if (cond) { x=100; std::atexit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4309,8 +4309,8 @@ void test__std__atexit__arg1__notnull() {
 }
 
 void test__atoi__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atoi(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atoi(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4343,8 +4343,8 @@ void test__atoi__arg1__notuninit() {
 }
 
 void test__std__atoi__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atoi(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atoi(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4377,8 +4377,8 @@ void test__std__atoi__arg1__notuninit() {
 }
 
 void test__atol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atol(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atol(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4411,8 +4411,8 @@ void test__atol__arg1__notuninit() {
 }
 
 void test__std__atol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atol(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atol(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4445,8 +4445,8 @@ void test__std__atol__arg1__notuninit() {
 }
 
 void test__atoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atoll(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atoll(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4479,8 +4479,8 @@ void test__atoll__arg1__notuninit() {
 }
 
 void test__std__atoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atoll(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atoll(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4513,8 +4513,8 @@ void test__std__atoll__arg1__notuninit() {
 }
 
 void test__atof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = atof(arg1);
+  int x = 1;
+  if (cond) { x=100; result = atof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4547,8 +4547,8 @@ void test__atof__arg1__notuninit() {
 }
 
 void test__std__atof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::atof(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::atof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4581,8 +4581,8 @@ void test__std__atof__arg1__notuninit() {
 }
 
 void test__calloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = calloc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = calloc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4605,8 +4605,8 @@ void test__calloc__arg2__notuninit() {
 }
 
 void test__ceil__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ceil(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ceil(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4634,8 +4634,8 @@ void test__ceil__arg1__notuninit() {
 }
 
 void test__std__ceil__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ceil(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ceil(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4663,8 +4663,8 @@ void test__std__ceil__arg1__notuninit() {
 }
 
 void test__ceilf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ceilf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ceilf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4692,8 +4692,8 @@ void test__ceilf__arg1__notuninit() {
 }
 
 void test__std__ceilf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ceilf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ceilf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4721,8 +4721,8 @@ void test__std__ceilf__arg1__notuninit() {
 }
 
 void test__ceill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ceill(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ceill(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4750,8 +4750,8 @@ void test__ceill__arg1__notuninit() {
 }
 
 void test__std__ceill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ceill(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ceill(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4779,8 +4779,8 @@ void test__std__ceill__arg1__notuninit() {
 }
 
 void test__copysign__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = copysign(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = copysign(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4814,8 +4814,8 @@ void test__copysign__arg2__notuninit() {
 }
 
 void test__std__copysign__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::copysign(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::copysign(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4849,8 +4849,8 @@ void test__std__copysign__arg2__notuninit() {
 }
 
 void test__copysignf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = copysignf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = copysignf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4884,8 +4884,8 @@ void test__copysignf__arg2__notuninit() {
 }
 
 void test__std__copysignf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::copysignf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::copysignf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4919,8 +4919,8 @@ void test__std__copysignf__arg2__notuninit() {
 }
 
 void test__copysignl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = copysignl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = copysignl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4954,8 +4954,8 @@ void test__copysignl__arg2__notuninit() {
 }
 
 void test__std__copysignl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::copysignl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::copysignl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4989,8 +4989,8 @@ void test__std__copysignl__arg2__notuninit() {
 }
 
 void test__clearerr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else clearerr(arg1);
+  int x = 1;
+  if (cond) { x=100; clearerr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5013,8 +5013,8 @@ void test__clearerr__arg1__notuninit() {
 }
 
 void test__std__clearerr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::clearerr(arg1);
+  int x = 1;
+  if (cond) { x=100; std::clearerr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5037,8 +5037,8 @@ void test__std__clearerr__arg1__notuninit() {
 }
 
 void test__clock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = clock();
+  int x = 1;
+  if (cond) { x=100; result = clock(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5055,8 +5055,8 @@ void test__clock__leakignore() {
 }
 
 void test__cbrt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cbrt(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cbrt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5084,8 +5084,8 @@ void test__cbrt__arg1__notuninit() {
 }
 
 void test__std__cbrt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cbrt(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cbrt(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5113,8 +5113,8 @@ void test__std__cbrt__arg1__notuninit() {
 }
 
 void test__cbrtf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cbrtf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cbrtf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5142,8 +5142,8 @@ void test__cbrtf__arg1__notuninit() {
 }
 
 void test__std__cbrtf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cbrtf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cbrtf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5171,8 +5171,8 @@ void test__std__cbrtf__arg1__notuninit() {
 }
 
 void test__cbrtl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cbrtl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cbrtl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5200,8 +5200,8 @@ void test__cbrtl__arg1__notuninit() {
 }
 
 void test__std__cbrtl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cbrtl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cbrtl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5229,8 +5229,8 @@ void test__std__cbrtl__arg1__notuninit() {
 }
 
 void test__cos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5258,8 +5258,8 @@ void test__cos__arg1__notuninit() {
 }
 
 void test__std__cos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5287,8 +5287,8 @@ void test__std__cos__arg1__notuninit() {
 }
 
 void test__cosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5316,8 +5316,8 @@ void test__cosf__arg1__notuninit() {
 }
 
 void test__std__cosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5345,8 +5345,8 @@ void test__std__cosf__arg1__notuninit() {
 }
 
 void test__cosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5374,8 +5374,8 @@ void test__cosl__arg1__notuninit() {
 }
 
 void test__std__cosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5403,8 +5403,8 @@ void test__std__cosl__arg1__notuninit() {
 }
 
 void test__ccos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5432,8 +5432,8 @@ void test__ccos__arg1__notuninit() {
 }
 
 void test__ccosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5461,8 +5461,8 @@ void test__ccosf__arg1__notuninit() {
 }
 
 void test__ccosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5490,8 +5490,8 @@ void test__ccosl__arg1__notuninit() {
 }
 
 void test__cosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5519,8 +5519,8 @@ void test__cosh__arg1__notuninit() {
 }
 
 void test__std__cosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::cosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::cosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5548,8 +5548,8 @@ void test__std__cosh__arg1__notuninit() {
 }
 
 void test__coshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = coshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = coshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5577,8 +5577,8 @@ void test__coshf__arg1__notuninit() {
 }
 
 void test__std__coshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::coshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::coshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5606,8 +5606,8 @@ void test__std__coshf__arg1__notuninit() {
 }
 
 void test__coshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = coshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = coshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5635,8 +5635,8 @@ void test__coshl__arg1__notuninit() {
 }
 
 void test__std__coshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::coshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::coshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5664,8 +5664,8 @@ void test__std__coshl__arg1__notuninit() {
 }
 
 void test__ccosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5693,8 +5693,8 @@ void test__ccosh__arg1__notuninit() {
 }
 
 void test__ccoshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccoshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccoshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5722,8 +5722,8 @@ void test__ccoshf__arg1__notuninit() {
 }
 
 void test__ccoshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ccoshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ccoshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5751,8 +5751,8 @@ void test__ccoshl__arg1__notuninit() {
 }
 
 void test__ctime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ctime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ctime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5780,8 +5780,8 @@ void test__ctime__arg1__notuninit() {
 }
 
 void test__std__ctime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ctime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ctime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5809,8 +5809,8 @@ void test__std__ctime__arg1__notuninit() {
 }
 
 void test__difftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = difftime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = difftime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5839,8 +5839,8 @@ void test__difftime__arg2__notuninit() {
 }
 
 void test__std__difftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::difftime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::difftime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5869,8 +5869,8 @@ void test__std__difftime__arg2__notuninit() {
 }
 
 void test__div__noreturn() {
-  int x = 100;
-  if (cond) x=1; else div(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; div(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5899,8 +5899,8 @@ void test__div__arg2__notuninit() {
 }
 
 void test__std__div__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::div(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::div(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5929,8 +5929,8 @@ void test__std__div__arg2__notuninit() {
 }
 
 void test__imaxdiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else imaxdiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; imaxdiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5959,8 +5959,8 @@ void test__imaxdiv__arg2__notuninit() {
 }
 
 void test__std__imaxdiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::imaxdiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::imaxdiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5989,8 +5989,8 @@ void test__std__imaxdiv__arg2__notuninit() {
 }
 
 void test__exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else exit(arg1);
+  int x = 1;
+  if (cond) { x=100; exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6002,8 +6002,8 @@ void test__exit__arg1__notuninit() {
 }
 
 void test__std__exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::exit(arg1);
+  int x = 1;
+  if (cond) { x=100; std::exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6015,8 +6015,8 @@ void test__std__exit__arg1__notuninit() {
 }
 
 void test__erf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6044,8 +6044,8 @@ void test__erf__arg1__notuninit() {
 }
 
 void test__std__erf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6073,8 +6073,8 @@ void test__std__erf__arg1__notuninit() {
 }
 
 void test__erff__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erff(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erff(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6102,8 +6102,8 @@ void test__erff__arg1__notuninit() {
 }
 
 void test__std__erff__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erff(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erff(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6131,8 +6131,8 @@ void test__std__erff__arg1__notuninit() {
 }
 
 void test__erfl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erfl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erfl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6160,8 +6160,8 @@ void test__erfl__arg1__notuninit() {
 }
 
 void test__std__erfl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erfl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erfl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6189,8 +6189,8 @@ void test__std__erfl__arg1__notuninit() {
 }
 
 void test__erfc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erfc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erfc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6218,8 +6218,8 @@ void test__erfc__arg1__notuninit() {
 }
 
 void test__std__erfc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erfc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erfc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6247,8 +6247,8 @@ void test__std__erfc__arg1__notuninit() {
 }
 
 void test__erfcf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erfcf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erfcf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6276,8 +6276,8 @@ void test__erfcf__arg1__notuninit() {
 }
 
 void test__std__erfcf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erfcf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erfcf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6305,8 +6305,8 @@ void test__std__erfcf__arg1__notuninit() {
 }
 
 void test__erfcl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = erfcl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = erfcl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6334,8 +6334,8 @@ void test__erfcl__arg1__notuninit() {
 }
 
 void test__std__erfcl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::erfcl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::erfcl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6363,8 +6363,8 @@ void test__std__erfcl__arg1__notuninit() {
 }
 
 void test__carg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = carg(arg1);
+  int x = 1;
+  if (cond) { x=100; result = carg(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6392,8 +6392,8 @@ void test__carg__arg1__notuninit() {
 }
 
 void test__cargf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cargf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cargf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6421,8 +6421,8 @@ void test__cargf__arg1__notuninit() {
 }
 
 void test__cargl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cargl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cargl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6450,8 +6450,8 @@ void test__cargl__arg1__notuninit() {
 }
 
 void test__exp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = exp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = exp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6479,8 +6479,8 @@ void test__exp__arg1__notuninit() {
 }
 
 void test__std__exp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::exp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::exp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6508,8 +6508,8 @@ void test__std__exp__arg1__notuninit() {
 }
 
 void test__expf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = expf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = expf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6537,8 +6537,8 @@ void test__expf__arg1__notuninit() {
 }
 
 void test__std__expf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::expf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::expf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6566,8 +6566,8 @@ void test__std__expf__arg1__notuninit() {
 }
 
 void test__expl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = expl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = expl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6595,8 +6595,8 @@ void test__expl__arg1__notuninit() {
 }
 
 void test__std__expl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::expl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::expl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6624,8 +6624,8 @@ void test__std__expl__arg1__notuninit() {
 }
 
 void test__cexp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cexp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cexp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6653,8 +6653,8 @@ void test__cexp__arg1__notuninit() {
 }
 
 void test__cexpf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cexpf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cexpf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6682,8 +6682,8 @@ void test__cexpf__arg1__notuninit() {
 }
 
 void test__cexpl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cexpl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cexpl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6711,8 +6711,8 @@ void test__cexpl__arg1__notuninit() {
 }
 
 void test__cimag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cimag(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cimag(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6740,8 +6740,8 @@ void test__cimag__arg1__notuninit() {
 }
 
 void test__cimagf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cimagf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cimagf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6769,8 +6769,8 @@ void test__cimagf__arg1__notuninit() {
 }
 
 void test__cimagl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cimagl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cimagl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6798,8 +6798,8 @@ void test__cimagl__arg1__notuninit() {
 }
 
 void test__exp2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = exp2(arg1);
+  int x = 1;
+  if (cond) { x=100; result = exp2(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6827,8 +6827,8 @@ void test__exp2__arg1__notuninit() {
 }
 
 void test__std__exp2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::exp2(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::exp2(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6856,8 +6856,8 @@ void test__std__exp2__arg1__notuninit() {
 }
 
 void test__exp2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = exp2f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = exp2f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6885,8 +6885,8 @@ void test__exp2f__arg1__notuninit() {
 }
 
 void test__std__exp2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::exp2f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::exp2f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6914,8 +6914,8 @@ void test__std__exp2f__arg1__notuninit() {
 }
 
 void test__exp2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = exp2l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = exp2l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6943,8 +6943,8 @@ void test__exp2l__arg1__notuninit() {
 }
 
 void test__std__exp2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::exp2l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::exp2l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6972,8 +6972,8 @@ void test__std__exp2l__arg1__notuninit() {
 }
 
 void test__expm1__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = expm1(arg1);
+  int x = 1;
+  if (cond) { x=100; result = expm1(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7001,8 +7001,8 @@ void test__expm1__arg1__notuninit() {
 }
 
 void test__std__expm1__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::expm1(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::expm1(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7030,8 +7030,8 @@ void test__std__expm1__arg1__notuninit() {
 }
 
 void test__expm1f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = expm1f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = expm1f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7059,8 +7059,8 @@ void test__expm1f__arg1__notuninit() {
 }
 
 void test__std__expm1f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::expm1f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::expm1f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7088,8 +7088,8 @@ void test__std__expm1f__arg1__notuninit() {
 }
 
 void test__expm1l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = expm1l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = expm1l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7117,8 +7117,8 @@ void test__expm1l__arg1__notuninit() {
 }
 
 void test__std__expm1l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::expm1l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::expm1l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7146,8 +7146,8 @@ void test__std__expm1l__arg1__notuninit() {
 }
 
 void test___Exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _Exit(arg1);
+  int x = 1;
+  if (cond) { x=100; _Exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7159,8 +7159,8 @@ void test___Exit__arg1__notuninit() {
 }
 
 void test__quick_exit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else quick_exit(arg1);
+  int x = 1;
+  if (cond) { x=100; quick_exit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7172,8 +7172,8 @@ void test__quick_exit__arg1__notuninit() {
 }
 
 void test__fabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7201,8 +7201,8 @@ void test__fabs__arg1__notuninit() {
 }
 
 void test__std__fabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::fabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7230,8 +7230,8 @@ void test__std__fabs__arg1__notuninit() {
 }
 
 void test__fabsf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fabsf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fabsf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7259,8 +7259,8 @@ void test__fabsf__arg1__notuninit() {
 }
 
 void test__std__fabsf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fabsf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::fabsf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7288,8 +7288,8 @@ void test__std__fabsf__arg1__notuninit() {
 }
 
 void test__fabsl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fabsl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fabsl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7317,8 +7317,8 @@ void test__fabsl__arg1__notuninit() {
 }
 
 void test__std__fabsl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fabsl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::fabsl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7346,8 +7346,8 @@ void test__std__fabsl__arg1__notuninit() {
 }
 
 void test__fdim__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fdim(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fdim(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7381,8 +7381,8 @@ void test__fdim__arg2__notuninit() {
 }
 
 void test__std__fdim__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fdim(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fdim(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7416,8 +7416,8 @@ void test__std__fdim__arg2__notuninit() {
 }
 
 void test__fdimf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fdimf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fdimf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7451,8 +7451,8 @@ void test__fdimf__arg2__notuninit() {
 }
 
 void test__std__fdimf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fdimf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fdimf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7486,8 +7486,8 @@ void test__std__fdimf__arg2__notuninit() {
 }
 
 void test__fdiml__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fdiml(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fdiml(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7521,8 +7521,8 @@ void test__fdiml__arg2__notuninit() {
 }
 
 void test__std__fdiml__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fdiml(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fdiml(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7556,8 +7556,8 @@ void test__std__fdiml__arg2__notuninit() {
 }
 
 void test__fclose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fclose(arg1);
+  int x = 1;
+  if (cond) { x=100; fclose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7574,8 +7574,8 @@ void test__fclose__arg1__notuninit() {
 }
 
 void test__std__fclose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fclose(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fclose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7592,8 +7592,8 @@ void test__std__fclose__arg1__notuninit() {
 }
 
 void test__feof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = feof(arg1);
+  int x = 1;
+  if (cond) { x=100; result = feof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7621,8 +7621,8 @@ void test__feof__arg1__notuninit() {
 }
 
 void test__std__feof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::feof(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::feof(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7650,8 +7650,8 @@ void test__std__feof__arg1__notuninit() {
 }
 
 void test__ferror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ferror(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ferror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7679,8 +7679,8 @@ void test__ferror__arg1__notuninit() {
 }
 
 void test__std__ferror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ferror(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ferror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7708,8 +7708,8 @@ void test__std__ferror__arg1__notuninit() {
 }
 
 void test__fflush__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fflush(arg1);
+  int x = 1;
+  if (cond) { x=100; fflush(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7727,8 +7727,8 @@ void test__fflush__arg1__notuninit() {
 }
 
 void test__std__fflush__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fflush(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fflush(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7746,8 +7746,8 @@ void test__std__fflush__arg1__notuninit() {
 }
 
 void test__fgetc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fgetc(arg1);
+  int x = 1;
+  if (cond) { x=100; fgetc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7770,8 +7770,8 @@ void test__fgetc__arg1__notuninit() {
 }
 
 void test__std__fgetc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fgetc(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fgetc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7794,8 +7794,8 @@ void test__std__fgetc__arg1__notuninit() {
 }
 
 void test__getc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getc(arg1);
+  int x = 1;
+  if (cond) { x=100; getc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7818,8 +7818,8 @@ void test__getc__arg1__notuninit() {
 }
 
 void test__std__getc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::getc(arg1);
+  int x = 1;
+  if (cond) { x=100; std::getc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7842,8 +7842,8 @@ void test__std__getc__arg1__notuninit() {
 }
 
 void test__fgetwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fgetwc(arg1);
+  int x = 1;
+  if (cond) { x=100; fgetwc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7866,8 +7866,8 @@ void test__fgetwc__arg1__notuninit() {
 }
 
 void test__std__fgetwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fgetwc(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fgetwc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7890,8 +7890,8 @@ void test__std__fgetwc__arg1__notuninit() {
 }
 
 void test__getwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getwc(arg1);
+  int x = 1;
+  if (cond) { x=100; getwc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7914,8 +7914,8 @@ void test__getwc__arg1__notuninit() {
 }
 
 void test__std__getwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::getwc(arg1);
+  int x = 1;
+  if (cond) { x=100; std::getwc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7938,8 +7938,8 @@ void test__std__getwc__arg1__notuninit() {
 }
 
 void test__fgetpos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fgetpos(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fgetpos(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7967,8 +7967,8 @@ void test__fgetpos__arg2__notnull() {
 }
 
 void test__std__fgetpos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fgetpos(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fgetpos(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7996,8 +7996,8 @@ void test__std__fgetpos__arg2__notnull() {
 }
 
 void test__floor__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = floor(arg1);
+  int x = 1;
+  if (cond) { x=100; result = floor(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8025,8 +8025,8 @@ void test__floor__arg1__notuninit() {
 }
 
 void test__std__floor__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::floor(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::floor(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8054,8 +8054,8 @@ void test__std__floor__arg1__notuninit() {
 }
 
 void test__floorf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = floorf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = floorf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8083,8 +8083,8 @@ void test__floorf__arg1__notuninit() {
 }
 
 void test__std__floorf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::floorf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::floorf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8112,8 +8112,8 @@ void test__std__floorf__arg1__notuninit() {
 }
 
 void test__floorl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = floorl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = floorl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8141,8 +8141,8 @@ void test__floorl__arg1__notuninit() {
 }
 
 void test__std__floorl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::floorl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::floorl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8170,8 +8170,8 @@ void test__std__floorl__arg1__notuninit() {
 }
 
 void test__fma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fma(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = fma(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8211,8 +8211,8 @@ void test__fma__arg3__notuninit() {
 }
 
 void test__std__fma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fma(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::fma(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8252,8 +8252,8 @@ void test__std__fma__arg3__notuninit() {
 }
 
 void test__fmaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmaf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = fmaf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8293,8 +8293,8 @@ void test__fmaf__arg3__notuninit() {
 }
 
 void test__std__fmaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmaf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::fmaf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8334,8 +8334,8 @@ void test__std__fmaf__arg3__notuninit() {
 }
 
 void test__fmal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmal(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = fmal(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8375,8 +8375,8 @@ void test__fmal__arg3__notuninit() {
 }
 
 void test__std__fmal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmal(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::fmal(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8416,8 +8416,8 @@ void test__std__fmal__arg3__notuninit() {
 }
 
 void test__fmax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmax(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmax(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8451,8 +8451,8 @@ void test__fmax__arg2__notuninit() {
 }
 
 void test__std__fmax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmax(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmax(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8486,8 +8486,8 @@ void test__std__fmax__arg2__notuninit() {
 }
 
 void test__fmaxf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmaxf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmaxf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8521,8 +8521,8 @@ void test__fmaxf__arg2__notuninit() {
 }
 
 void test__std__fmaxf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmaxf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmaxf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8556,8 +8556,8 @@ void test__std__fmaxf__arg2__notuninit() {
 }
 
 void test__fmaxl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmaxl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmaxl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8591,8 +8591,8 @@ void test__fmaxl__arg2__notuninit() {
 }
 
 void test__std__fmaxl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmaxl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmaxl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8626,8 +8626,8 @@ void test__std__fmaxl__arg2__notuninit() {
 }
 
 void test__fmin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmin(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmin(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8661,8 +8661,8 @@ void test__fmin__arg2__notuninit() {
 }
 
 void test__std__fmin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmin(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmin(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8696,8 +8696,8 @@ void test__std__fmin__arg2__notuninit() {
 }
 
 void test__fminf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fminf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fminf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8731,8 +8731,8 @@ void test__fminf__arg2__notuninit() {
 }
 
 void test__std__fminf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fminf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fminf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8766,8 +8766,8 @@ void test__std__fminf__arg2__notuninit() {
 }
 
 void test__fminl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fminl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fminl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8801,8 +8801,8 @@ void test__fminl__arg2__notuninit() {
 }
 
 void test__std__fminl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fminl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fminl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8836,8 +8836,8 @@ void test__std__fminl__arg2__notuninit() {
 }
 
 void test__fmod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8871,8 +8871,8 @@ void test__fmod__arg2__notuninit() {
 }
 
 void test__std__fmod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8906,8 +8906,8 @@ void test__std__fmod__arg2__notuninit() {
 }
 
 void test__fmodf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmodf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmodf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8941,8 +8941,8 @@ void test__fmodf__arg2__notuninit() {
 }
 
 void test__std__fmodf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmodf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmodf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8976,8 +8976,8 @@ void test__std__fmodf__arg2__notuninit() {
 }
 
 void test__fmodl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fmodl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fmodl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9011,8 +9011,8 @@ void test__fmodl__arg2__notuninit() {
 }
 
 void test__std__fmodl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fmodl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fmodl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9046,8 +9046,8 @@ void test__std__fmodl__arg2__notuninit() {
 }
 
 void test__fopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = fopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9080,8 +9080,8 @@ void test__fopen__arg2__notuninit() {
 }
 
 void test__std__fopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::fopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9114,8 +9114,8 @@ void test__std__fopen__arg2__notuninit() {
 }
 
 void test__fopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fopen_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fopen_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9148,8 +9148,8 @@ void test__fopen_s__arg3__notuninit() {
 }
 
 void test__fprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9178,8 +9178,8 @@ void test__fprintf__arg2__notuninit() {
 }
 
 void test__std__fprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9208,8 +9208,8 @@ void test__std__fprintf__arg2__notuninit() {
 }
 
 void test__vfprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vfprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9238,8 +9238,8 @@ void test__vfprintf__arg2__notuninit() {
 }
 
 void test__std__vfprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vfprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vfprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9268,8 +9268,8 @@ void test__std__vfprintf__arg2__notuninit() {
 }
 
 void test__vfwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfwprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vfwprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9298,8 +9298,8 @@ void test__vfwprintf__arg2__notuninit() {
 }
 
 void test__std__vfwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vfwprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vfwprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9328,8 +9328,8 @@ void test__std__vfwprintf__arg2__notuninit() {
 }
 
 void test__fputc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fputc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fputc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9363,8 +9363,8 @@ void test__fputc__arg2__notuninit() {
 }
 
 void test__std__fputc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fputc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fputc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9398,8 +9398,8 @@ void test__std__fputc__arg2__notuninit() {
 }
 
 void test__fputwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fputwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fputwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9433,8 +9433,8 @@ void test__fputwc__arg2__notuninit() {
 }
 
 void test__std__fputwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fputwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fputwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9468,8 +9468,8 @@ void test__std__fputwc__arg2__notuninit() {
 }
 
 void test__fputs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fputs(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fputs(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9503,8 +9503,8 @@ void test__fputs__arg2__notuninit() {
 }
 
 void test__std__fputs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fputs(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fputs(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9538,8 +9538,8 @@ void test__std__fputs__arg2__notuninit() {
 }
 
 void test__fputws__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fputws(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fputws(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9573,8 +9573,8 @@ void test__fputws__arg2__notuninit() {
 }
 
 void test__std__fputws__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fputws(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fputws(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9608,8 +9608,8 @@ void test__std__fputws__arg2__notuninit() {
 }
 
 void test__fread__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fread(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; fread(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9649,8 +9649,8 @@ void test__fread__arg4__notuninit() {
 }
 
 void test__std__fread__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fread(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::fread(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9690,8 +9690,8 @@ void test__std__fread__arg4__notuninit() {
 }
 
 void test__free__noreturn() {
-  int x = 100;
-  if (cond) x=1; else free(arg1);
+  int x = 1;
+  if (cond) { x=100; free(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9703,8 +9703,8 @@ void test__free__arg1__notuninit() {
 }
 
 void test__std__free__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::free(arg1);
+  int x = 1;
+  if (cond) { x=100; std::free(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9716,8 +9716,8 @@ void test__std__free__arg1__notuninit() {
 }
 
 void test__freopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = freopen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = freopen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9756,8 +9756,8 @@ void test__freopen__arg3__notuninit() {
 }
 
 void test__std__freopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::freopen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::freopen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9796,8 +9796,8 @@ void test__std__freopen__arg3__notuninit() {
 }
 
 void test__freopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = freopen_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = freopen_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9842,8 +9842,8 @@ void test__freopen_s__arg4__notuninit() {
 }
 
 void test__frexp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else frexp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; frexp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9866,8 +9866,8 @@ void test__frexp__arg2__notnull() {
 }
 
 void test__std__frexp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::frexp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::frexp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9890,8 +9890,8 @@ void test__std__frexp__arg2__notnull() {
 }
 
 void test__frexpf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else frexpf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; frexpf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9914,8 +9914,8 @@ void test__frexpf__arg2__notnull() {
 }
 
 void test__std__frexpf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::frexpf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::frexpf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9938,8 +9938,8 @@ void test__std__frexpf__arg2__notnull() {
 }
 
 void test__frexpl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else frexpl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; frexpl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9962,8 +9962,8 @@ void test__frexpl__arg2__notnull() {
 }
 
 void test__std__frexpl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::frexpl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::frexpl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9986,8 +9986,8 @@ void test__std__frexpl__arg2__notnull() {
 }
 
 void test__hypot__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = hypot(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = hypot(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10027,8 +10027,8 @@ void test__hypot__arg3__notuninit() {
 }
 
 void test__std__hypot__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::hypot(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::hypot(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10068,8 +10068,8 @@ void test__std__hypot__arg3__notuninit() {
 }
 
 void test__hypotf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = hypotf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = hypotf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10103,8 +10103,8 @@ void test__hypotf__arg2__notuninit() {
 }
 
 void test__std__hypotf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::hypotf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::hypotf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10138,8 +10138,8 @@ void test__std__hypotf__arg2__notuninit() {
 }
 
 void test__hypotl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = hypotl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = hypotl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10173,8 +10173,8 @@ void test__hypotl__arg2__notuninit() {
 }
 
 void test__std__hypotl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::hypotl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::hypotl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10208,8 +10208,8 @@ void test__std__hypotl__arg2__notuninit() {
 }
 
 void test__fscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10233,8 +10233,8 @@ void test__fscanf__arg2__notuninit() {
 }
 
 void test__std__fscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10258,8 +10258,8 @@ void test__std__fscanf__arg2__notuninit() {
 }
 
 void test__vfscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vfscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10283,8 +10283,8 @@ void test__vfscanf__arg2__notuninit() {
 }
 
 void test__std__vfscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vfscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vfscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10308,8 +10308,8 @@ void test__std__vfscanf__arg2__notuninit() {
 }
 
 void test__vfwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vfwscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vfwscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10338,8 +10338,8 @@ void test__vfwscanf__arg2__notuninit() {
 }
 
 void test__std__vfwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vfwscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vfwscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10368,8 +10368,8 @@ void test__std__vfwscanf__arg2__notuninit() {
 }
 
 void test__fseek__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fseek(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fseek(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10404,8 +10404,8 @@ void test__fseek__arg3__notuninit() {
 }
 
 void test__std__fseek__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fseek(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::fseek(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10440,8 +10440,8 @@ void test__std__fseek__arg3__notuninit() {
 }
 
 void test__fsetpos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fsetpos(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fsetpos(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10475,8 +10475,8 @@ void test__fsetpos__arg2__notuninit() {
 }
 
 void test__std__fsetpos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fsetpos(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fsetpos(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10510,8 +10510,8 @@ void test__std__fsetpos__arg2__notuninit() {
 }
 
 void test__fgets__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fgets(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fgets(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10550,8 +10550,8 @@ void test__fgets__arg3__notuninit() {
 }
 
 void test__std__fgets__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fgets(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::fgets(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10590,8 +10590,8 @@ void test__std__fgets__arg3__notuninit() {
 }
 
 void test__fgetws__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fgetws(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; fgetws(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10630,8 +10630,8 @@ void test__fgetws__arg3__notuninit() {
 }
 
 void test__std__fgetws__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fgetws(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::fgetws(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10670,8 +10670,8 @@ void test__std__fgetws__arg3__notuninit() {
 }
 
 void test__ftell__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ftell(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ftell(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10699,8 +10699,8 @@ void test__ftell__arg1__notuninit() {
 }
 
 void test__std__ftell__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ftell(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ftell(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10728,8 +10728,8 @@ void test__std__ftell__arg1__notuninit() {
 }
 
 void test__fwide__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwide(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fwide(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10758,8 +10758,8 @@ void test__fwide__arg2__notuninit() {
 }
 
 void test__std__fwide__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fwide(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fwide(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10788,8 +10788,8 @@ void test__std__fwide__arg2__notuninit() {
 }
 
 void test__fwrite__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwrite(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; fwrite(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10835,8 +10835,8 @@ void test__fwrite__arg4__notuninit() {
 }
 
 void test__std__fwrite__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fwrite(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::fwrite(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10882,8 +10882,8 @@ void test__std__fwrite__arg4__notuninit() {
 }
 
 void test__mblen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mblen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; mblen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10907,8 +10907,8 @@ void test__mblen__arg2__notuninit() {
 }
 
 void test__std__mblen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mblen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::mblen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10932,8 +10932,8 @@ void test__std__mblen__arg2__notuninit() {
 }
 
 void test__mbtowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbtowc(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; mbtowc(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10957,8 +10957,8 @@ void test__mbtowc__arg3__notuninit() {
 }
 
 void test__std__mbtowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbtowc(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::mbtowc(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10982,8 +10982,8 @@ void test__std__mbtowc__arg3__notuninit() {
 }
 
 void test__mbrlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbrlen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; mbrlen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11018,8 +11018,8 @@ void test__mbrlen__arg3__notuninit() {
 }
 
 void test__std__mbrlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbrlen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::mbrlen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11054,8 +11054,8 @@ void test__std__mbrlen__arg3__notuninit() {
 }
 
 void test__btowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = btowc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = btowc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11083,8 +11083,8 @@ void test__btowc__arg1__notuninit() {
 }
 
 void test__std__btowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::btowc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::btowc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11112,8 +11112,8 @@ void test__std__btowc__arg1__notuninit() {
 }
 
 void test__mbsinit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbsinit(arg1);
+  int x = 1;
+  if (cond) { x=100; mbsinit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11131,8 +11131,8 @@ void test__mbsinit__arg1__notuninit() {
 }
 
 void test__std__mbsinit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbsinit(arg1);
+  int x = 1;
+  if (cond) { x=100; std::mbsinit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11150,8 +11150,8 @@ void test__std__mbsinit__arg1__notuninit() {
 }
 
 void test__getwchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getwchar();
+  int x = 1;
+  if (cond) { x=100; getwchar(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11163,8 +11163,8 @@ void test__getwchar__leakignore() {
 }
 
 void test__mbstowcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbstowcs(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; mbstowcs(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11193,8 +11193,8 @@ void test__mbstowcs__arg3__notuninit() {
 }
 
 void test__std__mbstowcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbstowcs(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::mbstowcs(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11223,8 +11223,8 @@ void test__std__mbstowcs__arg3__notuninit() {
 }
 
 void test__mbsrtowcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbsrtowcs(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mbsrtowcs(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11258,8 +11258,8 @@ void test__mbsrtowcs__arg4__notnull() {
 }
 
 void test__std__mbsrtowcs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbsrtowcs(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::mbsrtowcs(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11293,8 +11293,8 @@ void test__std__mbsrtowcs__arg4__notnull() {
 }
 
 void test__wctob__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wctob(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wctob(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11322,8 +11322,8 @@ void test__wctob__arg1__notuninit() {
 }
 
 void test__std__wctob__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wctob(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::wctob(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11351,8 +11351,8 @@ void test__std__wctob__arg1__notuninit() {
 }
 
 void test__wctomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wctomb(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wctomb(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11376,8 +11376,8 @@ void test__wctomb__arg2__notuninit() {
 }
 
 void test__std__wctomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wctomb(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::wctomb(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11401,8 +11401,8 @@ void test__std__wctomb__arg2__notuninit() {
 }
 
 void test__wcstombs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstombs(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstombs(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11431,8 +11431,8 @@ void test__wcstombs__arg3__notuninit() {
 }
 
 void test__std__wcstombs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstombs(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstombs(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11461,8 +11461,8 @@ void test__std__wcstombs__arg3__notuninit() {
 }
 
 void test__getchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getchar();
+  int x = 1;
+  if (cond) { x=100; getchar(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11474,8 +11474,8 @@ void test__getchar__leakignore() {
 }
 
 void test__ungetc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ungetc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ungetc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11504,8 +11504,8 @@ void test__ungetc__arg2__notuninit() {
 }
 
 void test__std__ungetc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ungetc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::ungetc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11534,8 +11534,8 @@ void test__std__ungetc__arg2__notuninit() {
 }
 
 void test__ungetwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ungetwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ungetwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11564,8 +11564,8 @@ void test__ungetwc__arg2__notuninit() {
 }
 
 void test__std__ungetwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ungetwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::ungetwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11594,8 +11594,8 @@ void test__std__ungetwc__arg2__notuninit() {
 }
 
 void test__getenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = getenv(arg1);
+  int x = 1;
+  if (cond) { x=100; result = getenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11623,8 +11623,8 @@ void test__getenv__arg1__notuninit() {
 }
 
 void test__std__getenv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::getenv(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::getenv(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11652,8 +11652,8 @@ void test__std__getenv__arg1__notuninit() {
 }
 
 void test__gets__noreturn() {
-  int x = 100;
-  if (cond) x=1; else gets(arg1);
+  int x = 1;
+  if (cond) { x=100; gets(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11670,8 +11670,8 @@ void test__gets__arg1__notnull() {
 }
 
 void test__std__gets__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::gets(arg1);
+  int x = 1;
+  if (cond) { x=100; std::gets(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11688,8 +11688,8 @@ void test__std__gets__arg1__notnull() {
 }
 
 void test__gets_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else gets_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; gets_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11717,8 +11717,8 @@ void test__gets_s__arg2__notuninit() {
 }
 
 void test__std__gets_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::gets_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::gets_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11746,8 +11746,8 @@ void test__std__gets_s__arg2__notuninit() {
 }
 
 void test__gmtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = gmtime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = gmtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11780,8 +11780,8 @@ void test__gmtime__arg1__notuninit() {
 }
 
 void test__std__gmtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::gmtime(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::gmtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11814,8 +11814,8 @@ void test__std__gmtime__arg1__notuninit() {
 }
 
 void test__isalnum__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isalnum(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isalnum(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11843,8 +11843,8 @@ void test__isalnum__arg1__notuninit() {
 }
 
 void test__std__isalnum__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isalnum(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isalnum(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11872,8 +11872,8 @@ void test__std__isalnum__arg1__notuninit() {
 }
 
 void test__iswalnum__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswalnum(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswalnum(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11901,8 +11901,8 @@ void test__iswalnum__arg1__notuninit() {
 }
 
 void test__std__iswalnum__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswalnum(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswalnum(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11930,8 +11930,8 @@ void test__std__iswalnum__arg1__notuninit() {
 }
 
 void test__isalpha__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isalpha(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isalpha(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11959,8 +11959,8 @@ void test__isalpha__arg1__notuninit() {
 }
 
 void test__std__isalpha__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isalpha(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isalpha(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11988,8 +11988,8 @@ void test__std__isalpha__arg1__notuninit() {
 }
 
 void test__iswalpha__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswalpha(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswalpha(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12017,8 +12017,8 @@ void test__iswalpha__arg1__notuninit() {
 }
 
 void test__std__iswalpha__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswalpha(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswalpha(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12046,8 +12046,8 @@ void test__std__iswalpha__arg1__notuninit() {
 }
 
 void test__isblank__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isblank(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isblank(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12075,8 +12075,8 @@ void test__isblank__arg1__notuninit() {
 }
 
 void test__std__isblank__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isblank(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isblank(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12104,8 +12104,8 @@ void test__std__isblank__arg1__notuninit() {
 }
 
 void test__iswblank__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswblank(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswblank(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12133,8 +12133,8 @@ void test__iswblank__arg1__notuninit() {
 }
 
 void test__std__iswblank__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswblank(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswblank(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12162,8 +12162,8 @@ void test__std__iswblank__arg1__notuninit() {
 }
 
 void test__iscntrl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iscntrl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iscntrl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12191,8 +12191,8 @@ void test__iscntrl__arg1__notuninit() {
 }
 
 void test__std__iscntrl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iscntrl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iscntrl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12220,8 +12220,8 @@ void test__std__iscntrl__arg1__notuninit() {
 }
 
 void test__iswcntrl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswcntrl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswcntrl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12249,8 +12249,8 @@ void test__iswcntrl__arg1__notuninit() {
 }
 
 void test__std__iswcntrl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswcntrl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswcntrl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12278,8 +12278,8 @@ void test__std__iswcntrl__arg1__notuninit() {
 }
 
 void test__iswctype__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswctype(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = iswctype(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12313,8 +12313,8 @@ void test__iswctype__arg2__notuninit() {
 }
 
 void test__std__iswctype__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswctype(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::iswctype(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12348,8 +12348,8 @@ void test__std__iswctype__arg2__notuninit() {
 }
 
 void test__isdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12377,8 +12377,8 @@ void test__isdigit__arg1__notuninit() {
 }
 
 void test__std__isdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12406,8 +12406,8 @@ void test__std__isdigit__arg1__notuninit() {
 }
 
 void test__iswdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12435,8 +12435,8 @@ void test__iswdigit__arg1__notuninit() {
 }
 
 void test__std__iswdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12464,8 +12464,8 @@ void test__std__iswdigit__arg1__notuninit() {
 }
 
 void test__isgraph__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isgraph(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isgraph(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12493,8 +12493,8 @@ void test__isgraph__arg1__notuninit() {
 }
 
 void test__std__isgraph__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isgraph(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isgraph(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12522,8 +12522,8 @@ void test__std__isgraph__arg1__notuninit() {
 }
 
 void test__iswgraph__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswgraph(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswgraph(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12551,8 +12551,8 @@ void test__iswgraph__arg1__notuninit() {
 }
 
 void test__std__iswgraph__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswgraph(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswgraph(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12580,8 +12580,8 @@ void test__std__iswgraph__arg1__notuninit() {
 }
 
 void test__islower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = islower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = islower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12609,8 +12609,8 @@ void test__islower__arg1__notuninit() {
 }
 
 void test__std__islower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::islower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::islower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12638,8 +12638,8 @@ void test__std__islower__arg1__notuninit() {
 }
 
 void test__iswlower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswlower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswlower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12667,8 +12667,8 @@ void test__iswlower__arg1__notuninit() {
 }
 
 void test__std__iswlower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswlower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswlower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12696,8 +12696,8 @@ void test__std__iswlower__arg1__notuninit() {
 }
 
 void test__isprint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isprint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isprint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12725,8 +12725,8 @@ void test__isprint__arg1__notuninit() {
 }
 
 void test__std__isprint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isprint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isprint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12754,8 +12754,8 @@ void test__std__isprint__arg1__notuninit() {
 }
 
 void test__iswprint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswprint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswprint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12783,8 +12783,8 @@ void test__iswprint__arg1__notuninit() {
 }
 
 void test__std__iswprint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswprint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswprint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12812,8 +12812,8 @@ void test__std__iswprint__arg1__notuninit() {
 }
 
 void test__ispunct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ispunct(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ispunct(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12841,8 +12841,8 @@ void test__ispunct__arg1__notuninit() {
 }
 
 void test__std__ispunct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ispunct(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ispunct(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12870,8 +12870,8 @@ void test__std__ispunct__arg1__notuninit() {
 }
 
 void test__iswpunct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswpunct(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswpunct(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12899,8 +12899,8 @@ void test__iswpunct__arg1__notuninit() {
 }
 
 void test__std__iswpunct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswpunct(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswpunct(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12928,8 +12928,8 @@ void test__std__iswpunct__arg1__notuninit() {
 }
 
 void test__isspace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isspace(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isspace(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12957,8 +12957,8 @@ void test__isspace__arg1__notuninit() {
 }
 
 void test__std__isspace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isspace(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isspace(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12986,8 +12986,8 @@ void test__std__isspace__arg1__notuninit() {
 }
 
 void test__iswspace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswspace(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswspace(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13015,8 +13015,8 @@ void test__iswspace__arg1__notuninit() {
 }
 
 void test__std__iswspace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswspace(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswspace(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13044,8 +13044,8 @@ void test__std__iswspace__arg1__notuninit() {
 }
 
 void test__isupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13073,8 +13073,8 @@ void test__isupper__arg1__notuninit() {
 }
 
 void test__std__isupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13102,8 +13102,8 @@ void test__std__isupper__arg1__notuninit() {
 }
 
 void test__iswupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13131,8 +13131,8 @@ void test__iswupper__arg1__notuninit() {
 }
 
 void test__std__iswupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13160,8 +13160,8 @@ void test__std__iswupper__arg1__notuninit() {
 }
 
 void test__isxdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isxdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isxdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13189,8 +13189,8 @@ void test__isxdigit__arg1__notuninit() {
 }
 
 void test__std__isxdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isxdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isxdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13218,8 +13218,8 @@ void test__std__isxdigit__arg1__notuninit() {
 }
 
 void test__iswxdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = iswxdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = iswxdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13247,8 +13247,8 @@ void test__iswxdigit__arg1__notuninit() {
 }
 
 void test__std__iswxdigit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::iswxdigit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::iswxdigit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13276,8 +13276,8 @@ void test__std__iswxdigit__arg1__notuninit() {
 }
 
 void test__towctrans__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = towctrans(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = towctrans(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13311,8 +13311,8 @@ void test__towctrans__arg2__notuninit() {
 }
 
 void test__std__towctrans__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::towctrans(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::towctrans(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13346,8 +13346,8 @@ void test__std__towctrans__arg2__notuninit() {
 }
 
 void test__towlower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = towlower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = towlower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13375,8 +13375,8 @@ void test__towlower__arg1__notuninit() {
 }
 
 void test__std__towlower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::towlower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::towlower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13404,8 +13404,8 @@ void test__std__towlower__arg1__notuninit() {
 }
 
 void test__towupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = towupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = towupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13433,8 +13433,8 @@ void test__towupper__arg1__notuninit() {
 }
 
 void test__std__towupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::towupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::towupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13462,8 +13462,8 @@ void test__std__towupper__arg1__notuninit() {
 }
 
 void test__wctrans__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wctrans(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wctrans(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13496,8 +13496,8 @@ void test__wctrans__arg1__notuninit() {
 }
 
 void test__std__wctrans__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wctrans(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::wctrans(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13530,8 +13530,8 @@ void test__std__wctrans__arg1__notuninit() {
 }
 
 void test__wctype__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wctype(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wctype(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13564,8 +13564,8 @@ void test__wctype__arg1__notuninit() {
 }
 
 void test__std__wctype__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wctype(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::wctype(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13598,8 +13598,8 @@ void test__std__wctype__arg1__notuninit() {
 }
 
 void test__cabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13627,8 +13627,8 @@ void test__cabs__arg1__notuninit() {
 }
 
 void test__cabsf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cabsf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cabsf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13656,8 +13656,8 @@ void test__cabsf__arg1__notuninit() {
 }
 
 void test__cabsl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cabsl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cabsl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13685,8 +13685,8 @@ void test__cabsl__arg1__notuninit() {
 }
 
 void test__cacos__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacos(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacos(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13714,8 +13714,8 @@ void test__cacos__arg1__notuninit() {
 }
 
 void test__cacosf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacosf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacosf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13743,8 +13743,8 @@ void test__cacosf__arg1__notuninit() {
 }
 
 void test__cacosl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacosl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacosl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13772,8 +13772,8 @@ void test__cacosl__arg1__notuninit() {
 }
 
 void test__cacosh__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacosh(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacosh(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13801,8 +13801,8 @@ void test__cacosh__arg1__notuninit() {
 }
 
 void test__cacoshf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacoshf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacoshf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13830,8 +13830,8 @@ void test__cacoshf__arg1__notuninit() {
 }
 
 void test__cacoshl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cacoshl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = cacoshl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13859,8 +13859,8 @@ void test__cacoshl__arg1__notuninit() {
 }
 
 void test__labs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = labs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = labs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13888,8 +13888,8 @@ void test__labs__arg1__notuninit() {
 }
 
 void test__std__labs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::labs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::labs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13917,8 +13917,8 @@ void test__std__labs__arg1__notuninit() {
 }
 
 void test__llabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13946,8 +13946,8 @@ void test__llabs__arg1__notuninit() {
 }
 
 void test__std__llabs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llabs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llabs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13975,8 +13975,8 @@ void test__std__llabs__arg1__notuninit() {
 }
 
 void test__ldexp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ldexp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = ldexp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14010,8 +14010,8 @@ void test__ldexp__arg2__notuninit() {
 }
 
 void test__std__ldexp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ldexp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::ldexp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14045,8 +14045,8 @@ void test__std__ldexp__arg2__notuninit() {
 }
 
 void test__ldexpf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ldexpf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = ldexpf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14080,8 +14080,8 @@ void test__ldexpf__arg2__notuninit() {
 }
 
 void test__std__ldexpf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ldexpf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::ldexpf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14115,8 +14115,8 @@ void test__std__ldexpf__arg2__notuninit() {
 }
 
 void test__ldexpl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ldexpl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = ldexpl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14150,8 +14150,8 @@ void test__ldexpl__arg2__notuninit() {
 }
 
 void test__std__ldexpl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ldexpl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::ldexpl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14185,8 +14185,8 @@ void test__std__ldexpl__arg2__notuninit() {
 }
 
 void test__lgamma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lgamma(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lgamma(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14214,8 +14214,8 @@ void test__lgamma__arg1__notuninit() {
 }
 
 void test__std__lgamma__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lgamma(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lgamma(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14243,8 +14243,8 @@ void test__std__lgamma__arg1__notuninit() {
 }
 
 void test__lgammaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lgammaf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lgammaf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14272,8 +14272,8 @@ void test__lgammaf__arg1__notuninit() {
 }
 
 void test__std__lgammaf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lgammaf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lgammaf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14301,8 +14301,8 @@ void test__std__lgammaf__arg1__notuninit() {
 }
 
 void test__lgammal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lgammal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lgammal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14330,8 +14330,8 @@ void test__lgammal__arg1__notuninit() {
 }
 
 void test__std__lgammal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lgammal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lgammal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14359,8 +14359,8 @@ void test__std__lgammal__arg1__notuninit() {
 }
 
 void test__rint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = rint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = rint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14388,8 +14388,8 @@ void test__rint__arg1__notuninit() {
 }
 
 void test__std__rint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::rint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::rint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14417,8 +14417,8 @@ void test__std__rint__arg1__notuninit() {
 }
 
 void test__rintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = rintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = rintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14446,8 +14446,8 @@ void test__rintf__arg1__notuninit() {
 }
 
 void test__std__rintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::rintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::rintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14475,8 +14475,8 @@ void test__std__rintf__arg1__notuninit() {
 }
 
 void test__rintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = rintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = rintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14504,8 +14504,8 @@ void test__rintl__arg1__notuninit() {
 }
 
 void test__std__rintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::rintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::rintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14533,8 +14533,8 @@ void test__std__rintl__arg1__notuninit() {
 }
 
 void test__lrint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lrint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lrint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14562,8 +14562,8 @@ void test__lrint__arg1__notuninit() {
 }
 
 void test__std__lrint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lrint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lrint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14591,8 +14591,8 @@ void test__std__lrint__arg1__notuninit() {
 }
 
 void test__lrintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lrintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lrintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14620,8 +14620,8 @@ void test__lrintf__arg1__notuninit() {
 }
 
 void test__std__lrintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lrintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lrintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14649,8 +14649,8 @@ void test__std__lrintf__arg1__notuninit() {
 }
 
 void test__lrintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lrintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lrintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14678,8 +14678,8 @@ void test__lrintl__arg1__notuninit() {
 }
 
 void test__std__lrintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lrintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lrintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14707,8 +14707,8 @@ void test__std__lrintl__arg1__notuninit() {
 }
 
 void test__llrint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llrint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llrint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14736,8 +14736,8 @@ void test__llrint__arg1__notuninit() {
 }
 
 void test__std__llrint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llrint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llrint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14765,8 +14765,8 @@ void test__std__llrint__arg1__notuninit() {
 }
 
 void test__llrintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llrintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llrintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14794,8 +14794,8 @@ void test__llrintf__arg1__notuninit() {
 }
 
 void test__std__llrintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llrintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llrintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14823,8 +14823,8 @@ void test__std__llrintf__arg1__notuninit() {
 }
 
 void test__llrintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llrintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llrintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14852,8 +14852,8 @@ void test__llrintl__arg1__notuninit() {
 }
 
 void test__std__llrintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llrintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llrintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14881,8 +14881,8 @@ void test__std__llrintl__arg1__notuninit() {
 }
 
 void test__llround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llround(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14910,8 +14910,8 @@ void test__llround__arg1__notuninit() {
 }
 
 void test__std__llround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llround(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14939,8 +14939,8 @@ void test__std__llround__arg1__notuninit() {
 }
 
 void test__llroundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llroundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llroundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14968,8 +14968,8 @@ void test__llroundf__arg1__notuninit() {
 }
 
 void test__std__llroundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llroundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llroundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14997,8 +14997,8 @@ void test__std__llroundf__arg1__notuninit() {
 }
 
 void test__llroundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = llroundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = llroundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15026,8 +15026,8 @@ void test__llroundl__arg1__notuninit() {
 }
 
 void test__std__llroundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::llroundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::llroundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15055,8 +15055,8 @@ void test__std__llroundl__arg1__notuninit() {
 }
 
 void test__lround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lround(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15084,8 +15084,8 @@ void test__lround__arg1__notuninit() {
 }
 
 void test__std__lround__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lround(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lround(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15113,8 +15113,8 @@ void test__std__lround__arg1__notuninit() {
 }
 
 void test__lroundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lroundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lroundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15142,8 +15142,8 @@ void test__lroundf__arg1__notuninit() {
 }
 
 void test__std__lroundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lroundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lroundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15171,8 +15171,8 @@ void test__std__lroundf__arg1__notuninit() {
 }
 
 void test__lroundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = lroundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = lroundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15200,8 +15200,8 @@ void test__lroundl__arg1__notuninit() {
 }
 
 void test__std__lroundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::lroundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::lroundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15229,8 +15229,8 @@ void test__std__lroundl__arg1__notuninit() {
 }
 
 void test__rand__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = rand();
+  int x = 1;
+  if (cond) { x=100; result = rand(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15247,8 +15247,8 @@ void test__rand__leakignore() {
 }
 
 void test__srand__noreturn() {
-  int x = 100;
-  if (cond) x=1; else srand(arg1);
+  int x = 1;
+  if (cond) { x=100; srand(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15266,8 +15266,8 @@ void test__srand__arg1__notuninit() {
 }
 
 void test__std__srand__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::srand(arg1);
+  int x = 1;
+  if (cond) { x=100; std::srand(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15285,8 +15285,8 @@ void test__std__srand__arg1__notuninit() {
 }
 
 void test__ldiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ldiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; ldiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15315,8 +15315,8 @@ void test__ldiv__arg2__notuninit() {
 }
 
 void test__std__ldiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ldiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::ldiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15345,8 +15345,8 @@ void test__std__ldiv__arg2__notuninit() {
 }
 
 void test__lldiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else lldiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; lldiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15375,8 +15375,8 @@ void test__lldiv__arg2__notuninit() {
 }
 
 void test__std__lldiv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::lldiv(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::lldiv(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15405,8 +15405,8 @@ void test__std__lldiv__arg2__notuninit() {
 }
 
 void test__localtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else localtime(arg1);
+  int x = 1;
+  if (cond) { x=100; localtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15429,8 +15429,8 @@ void test__localtime__arg1__notuninit() {
 }
 
 void test__std__localtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::localtime(arg1);
+  int x = 1;
+  if (cond) { x=100; std::localtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15453,8 +15453,8 @@ void test__std__localtime__arg1__notuninit() {
 }
 
 void test__localtime_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else localtime_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; localtime_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15476,8 +15476,8 @@ void test__localtime_s__arg2__notnull() {
 }
 
 void test__std__localtime_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::localtime_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::localtime_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15499,8 +15499,8 @@ void test__std__localtime_s__arg2__notnull() {
 }
 
 void test__log__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15523,8 +15523,8 @@ void test__log__arg1__notuninit() {
 }
 
 void test__std__log__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15547,8 +15547,8 @@ void test__std__log__arg1__notuninit() {
 }
 
 void test__logf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = logf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = logf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15571,8 +15571,8 @@ void test__logf__arg1__notuninit() {
 }
 
 void test__std__logf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::logf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::logf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15595,8 +15595,8 @@ void test__std__logf__arg1__notuninit() {
 }
 
 void test__logl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = logl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = logl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15619,8 +15619,8 @@ void test__logl__arg1__notuninit() {
 }
 
 void test__std__logl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::logl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::logl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15643,8 +15643,8 @@ void test__std__logl__arg1__notuninit() {
 }
 
 void test__clog__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = clog(arg1);
+  int x = 1;
+  if (cond) { x=100; result = clog(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15667,8 +15667,8 @@ void test__clog__arg1__notuninit() {
 }
 
 void test__clogf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = clogf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = clogf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15691,8 +15691,8 @@ void test__clogf__arg1__notuninit() {
 }
 
 void test__clogl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = clogl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = clogl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15715,8 +15715,8 @@ void test__clogl__arg1__notuninit() {
 }
 
 void test__conj__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = conj(arg1);
+  int x = 1;
+  if (cond) { x=100; result = conj(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15739,8 +15739,8 @@ void test__conj__arg1__notuninit() {
 }
 
 void test__conjf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = conjf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = conjf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15763,8 +15763,8 @@ void test__conjf__arg1__notuninit() {
 }
 
 void test__conjl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = conjl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = conjl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15787,8 +15787,8 @@ void test__conjl__arg1__notuninit() {
 }
 
 void test__fpclassify__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = fpclassify(arg1);
+  int x = 1;
+  if (cond) { x=100; result = fpclassify(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15816,8 +15816,8 @@ void test__fpclassify__arg1__notuninit() {
 }
 
 void test__std__fpclassify__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::fpclassify(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::fpclassify(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15845,8 +15845,8 @@ void test__std__fpclassify__arg1__notuninit() {
 }
 
 void test__isfinite__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isfinite(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isfinite(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15874,8 +15874,8 @@ void test__isfinite__arg1__notuninit() {
 }
 
 void test__std__isfinite__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isfinite(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isfinite(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15903,8 +15903,8 @@ void test__std__isfinite__arg1__notuninit() {
 }
 
 void test__isgreater__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isgreater(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = isgreater(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15938,8 +15938,8 @@ void test__isgreater__arg2__notuninit() {
 }
 
 void test__std__isgreater__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isgreater(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::isgreater(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -15973,8 +15973,8 @@ void test__std__isgreater__arg2__notuninit() {
 }
 
 void test__isgreaterequal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isgreaterequal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = isgreaterequal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16008,8 +16008,8 @@ void test__isgreaterequal__arg2__notuninit() {
 }
 
 void test__std__isgreaterequal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isgreaterequal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::isgreaterequal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16043,8 +16043,8 @@ void test__std__isgreaterequal__arg2__notuninit() {
 }
 
 void test__isinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16072,8 +16072,8 @@ void test__isinf__arg1__notuninit() {
 }
 
 void test__std__isinf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isinf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isinf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16101,8 +16101,8 @@ void test__std__isinf__arg1__notuninit() {
 }
 
 void test__logb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = logb(arg1);
+  int x = 1;
+  if (cond) { x=100; result = logb(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16130,8 +16130,8 @@ void test__logb__arg1__notuninit() {
 }
 
 void test__std__logb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::logb(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::logb(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16159,8 +16159,8 @@ void test__std__logb__arg1__notuninit() {
 }
 
 void test__logbf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = logbf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = logbf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16188,8 +16188,8 @@ void test__logbf__arg1__notuninit() {
 }
 
 void test__std__logbf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::logbf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::logbf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16217,8 +16217,8 @@ void test__std__logbf__arg1__notuninit() {
 }
 
 void test__logbl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = logbl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = logbl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16246,8 +16246,8 @@ void test__logbl__arg1__notuninit() {
 }
 
 void test__std__logbl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::logbl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::logbl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16275,8 +16275,8 @@ void test__std__logbl__arg1__notuninit() {
 }
 
 void test__isless__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isless(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = isless(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16310,8 +16310,8 @@ void test__isless__arg2__notuninit() {
 }
 
 void test__std__isless__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isless(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::isless(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16345,8 +16345,8 @@ void test__std__isless__arg2__notuninit() {
 }
 
 void test__islessequal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = islessequal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = islessequal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16380,8 +16380,8 @@ void test__islessequal__arg2__notuninit() {
 }
 
 void test__std__islessequal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::islessequal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::islessequal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16415,8 +16415,8 @@ void test__std__islessequal__arg2__notuninit() {
 }
 
 void test__islessgreater__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = islessgreater(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = islessgreater(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16450,8 +16450,8 @@ void test__islessgreater__arg2__notuninit() {
 }
 
 void test__std__islessgreater__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::islessgreater(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::islessgreater(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16485,8 +16485,8 @@ void test__std__islessgreater__arg2__notuninit() {
 }
 
 void test__nan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16519,8 +16519,8 @@ void test__nan__arg1__notuninit() {
 }
 
 void test__std__nan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16553,8 +16553,8 @@ void test__std__nan__arg1__notuninit() {
 }
 
 void test__nanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16587,8 +16587,8 @@ void test__nanf__arg1__notuninit() {
 }
 
 void test__std__nanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nanf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16621,8 +16621,8 @@ void test__std__nanf__arg1__notuninit() {
 }
 
 void test__nanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16655,8 +16655,8 @@ void test__nanl__arg1__notuninit() {
 }
 
 void test__std__nanl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nanl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nanl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16689,8 +16689,8 @@ void test__std__nanl__arg1__notuninit() {
 }
 
 void test__isnan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isnan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isnan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16718,8 +16718,8 @@ void test__isnan__arg1__notuninit() {
 }
 
 void test__std__isnan__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isnan(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isnan(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16747,8 +16747,8 @@ void test__std__isnan__arg1__notuninit() {
 }
 
 void test__isnormal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isnormal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = isnormal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16776,8 +16776,8 @@ void test__isnormal__arg1__notuninit() {
 }
 
 void test__std__isnormal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isnormal(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::isnormal(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16805,8 +16805,8 @@ void test__std__isnormal__arg1__notuninit() {
 }
 
 void test__isunordered__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = isunordered(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = isunordered(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16840,8 +16840,8 @@ void test__isunordered__arg2__notuninit() {
 }
 
 void test__std__isunordered__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::isunordered(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::isunordered(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16875,8 +16875,8 @@ void test__std__isunordered__arg2__notuninit() {
 }
 
 void test__ilogb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ilogb(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ilogb(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16904,8 +16904,8 @@ void test__ilogb__arg1__notuninit() {
 }
 
 void test__std__ilogb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ilogb(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ilogb(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16933,8 +16933,8 @@ void test__std__ilogb__arg1__notuninit() {
 }
 
 void test__ilogbf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ilogbf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ilogbf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16962,8 +16962,8 @@ void test__ilogbf__arg1__notuninit() {
 }
 
 void test__std__ilogbf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ilogbf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ilogbf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -16991,8 +16991,8 @@ void test__std__ilogbf__arg1__notuninit() {
 }
 
 void test__ilogbl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ilogbl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ilogbl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17020,8 +17020,8 @@ void test__ilogbl__arg1__notuninit() {
 }
 
 void test__std__ilogbl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ilogbl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::ilogbl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17049,8 +17049,8 @@ void test__std__ilogbl__arg1__notuninit() {
 }
 
 void test__log10__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log10(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log10(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17078,8 +17078,8 @@ void test__log10__arg1__notuninit() {
 }
 
 void test__std__log10__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log10(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log10(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17107,8 +17107,8 @@ void test__std__log10__arg1__notuninit() {
 }
 
 void test__log10f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log10f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log10f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17136,8 +17136,8 @@ void test__log10f__arg1__notuninit() {
 }
 
 void test__std__log10f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log10f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log10f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17165,8 +17165,8 @@ void test__std__log10f__arg1__notuninit() {
 }
 
 void test__log10l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log10l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log10l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17194,8 +17194,8 @@ void test__log10l__arg1__notuninit() {
 }
 
 void test__std__log10l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log10l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log10l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17223,8 +17223,8 @@ void test__std__log10l__arg1__notuninit() {
 }
 
 void test__log1p__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log1p(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log1p(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17252,8 +17252,8 @@ void test__log1p__arg1__notuninit() {
 }
 
 void test__std__log1p__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log1p(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log1p(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17281,8 +17281,8 @@ void test__std__log1p__arg1__notuninit() {
 }
 
 void test__log1pf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log1pf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log1pf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17310,8 +17310,8 @@ void test__log1pf__arg1__notuninit() {
 }
 
 void test__std__log1pf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log1pf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log1pf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17339,8 +17339,8 @@ void test__std__log1pf__arg1__notuninit() {
 }
 
 void test__log1pl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log1pl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log1pl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17368,8 +17368,8 @@ void test__log1pl__arg1__notuninit() {
 }
 
 void test__std__log1pl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log1pl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log1pl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17397,8 +17397,8 @@ void test__std__log1pl__arg1__notuninit() {
 }
 
 void test__log2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log2(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log2(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17426,8 +17426,8 @@ void test__log2__arg1__notuninit() {
 }
 
 void test__std__log2__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log2(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log2(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17455,8 +17455,8 @@ void test__std__log2__arg1__notuninit() {
 }
 
 void test__log2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log2f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log2f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17484,8 +17484,8 @@ void test__log2f__arg1__notuninit() {
 }
 
 void test__std__log2f__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log2f(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log2f(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17513,8 +17513,8 @@ void test__std__log2f__arg1__notuninit() {
 }
 
 void test__log2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = log2l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = log2l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17542,8 +17542,8 @@ void test__log2l__arg1__notuninit() {
 }
 
 void test__std__log2l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::log2l(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::log2l(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17571,8 +17571,8 @@ void test__std__log2l__arg1__notuninit() {
 }
 
 void test__nearbyint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nearbyint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nearbyint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17600,8 +17600,8 @@ void test__nearbyint__arg1__notuninit() {
 }
 
 void test__std__nearbyint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nearbyint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nearbyint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17629,8 +17629,8 @@ void test__std__nearbyint__arg1__notuninit() {
 }
 
 void test__nearbyintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nearbyintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nearbyintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17658,8 +17658,8 @@ void test__nearbyintf__arg1__notuninit() {
 }
 
 void test__std__nearbyintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nearbyintf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nearbyintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17687,8 +17687,8 @@ void test__std__nearbyintf__arg1__notuninit() {
 }
 
 void test__nearbyintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nearbyintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = nearbyintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17716,8 +17716,8 @@ void test__nearbyintl__arg1__notuninit() {
 }
 
 void test__std__nearbyintl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nearbyintl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::nearbyintl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17745,8 +17745,8 @@ void test__std__nearbyintl__arg1__notuninit() {
 }
 
 void test__nextafter__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nextafter(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nextafter(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17780,8 +17780,8 @@ void test__nextafter__arg2__notuninit() {
 }
 
 void test__std__nextafter__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nextafter(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nextafter(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17815,8 +17815,8 @@ void test__std__nextafter__arg2__notuninit() {
 }
 
 void test__nextafterf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nextafterf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nextafterf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17850,8 +17850,8 @@ void test__nextafterf__arg2__notuninit() {
 }
 
 void test__std__nextafterf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nextafterf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nextafterf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17885,8 +17885,8 @@ void test__std__nextafterf__arg2__notuninit() {
 }
 
 void test__nextafterl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nextafterl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nextafterl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17920,8 +17920,8 @@ void test__nextafterl__arg2__notuninit() {
 }
 
 void test__std__nextafterl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nextafterl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nextafterl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17955,8 +17955,8 @@ void test__std__nextafterl__arg2__notuninit() {
 }
 
 void test__nexttoward__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nexttoward(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nexttoward(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -17990,8 +17990,8 @@ void test__nexttoward__arg2__notuninit() {
 }
 
 void test__std__nexttoward__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nexttoward(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nexttoward(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18025,8 +18025,8 @@ void test__std__nexttoward__arg2__notuninit() {
 }
 
 void test__nexttowardf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nexttowardf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nexttowardf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18060,8 +18060,8 @@ void test__nexttowardf__arg2__notuninit() {
 }
 
 void test__std__nexttowardf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nexttowardf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nexttowardf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18095,8 +18095,8 @@ void test__std__nexttowardf__arg2__notuninit() {
 }
 
 void test__nexttowardl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = nexttowardl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = nexttowardl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18130,8 +18130,8 @@ void test__nexttowardl__arg2__notuninit() {
 }
 
 void test__std__nexttowardl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::nexttowardl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::nexttowardl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18165,8 +18165,8 @@ void test__std__nexttowardl__arg2__notuninit() {
 }
 
 void test__longjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else longjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; longjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18190,8 +18190,8 @@ void test__longjmp__arg2__notuninit() {
 }
 
 void test__std__longjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::longjmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::longjmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18215,8 +18215,8 @@ void test__std__longjmp__arg2__notuninit() {
 }
 
 void test__malloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = malloc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = malloc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18233,8 +18233,8 @@ void test__malloc__arg1__notuninit() {
 }
 
 void test__std__malloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::malloc(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::malloc(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18251,8 +18251,8 @@ void test__std__malloc__arg1__notuninit() {
 }
 
 void test__alloca__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = alloca(arg1);
+  int x = 1;
+  if (cond) { x=100; result = alloca(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18269,8 +18269,8 @@ void test__alloca__arg1__notuninit() {
 }
 
 void test__memchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = memchr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = memchr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18325,8 +18325,8 @@ void test__memchr__arg3__notuninit() {
 }
 
 void test__std__memchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::memchr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::memchr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18381,8 +18381,8 @@ void test__std__memchr__arg3__notuninit() {
 }
 
 void test__wmemchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wmemchr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = wmemchr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18437,8 +18437,8 @@ void test__wmemchr__arg3__notuninit() {
 }
 
 void test__std__wmemchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wmemchr(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wmemchr(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18493,8 +18493,8 @@ void test__std__wmemchr__arg3__notuninit() {
 }
 
 void test__memcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = memcmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = memcmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18549,8 +18549,8 @@ void test__memcmp__arg3__notuninit() {
 }
 
 void test__std__memcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::memcmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::memcmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18605,8 +18605,8 @@ void test__std__memcmp__arg3__notuninit() {
 }
 
 void test__wmemcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wmemcmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = wmemcmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18661,8 +18661,8 @@ void test__wmemcmp__arg3__notuninit() {
 }
 
 void test__std__wmemcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wmemcmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wmemcmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18717,8 +18717,8 @@ void test__std__wmemcmp__arg3__notuninit() {
 }
 
 void test__memcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memcpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; memcpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18757,8 +18757,8 @@ void test__memcpy__arg3__notuninit() {
 }
 
 void test__std__memcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::memcpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::memcpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18797,8 +18797,8 @@ void test__std__memcpy__arg3__notuninit() {
 }
 
 void test__wmemcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wmemcpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wmemcpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18837,8 +18837,8 @@ void test__wmemcpy__arg3__notuninit() {
 }
 
 void test__std__wmemcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wmemcpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wmemcpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18877,8 +18877,8 @@ void test__std__wmemcpy__arg3__notuninit() {
 }
 
 void test__memcpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memcpy_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; memcpy_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18928,8 +18928,8 @@ void test__memcpy_s__arg4__notuninit() {
 }
 
 void test__wmemcpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wmemcpy_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; wmemcpy_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -18979,8 +18979,8 @@ void test__wmemcpy_s__arg4__notuninit() {
 }
 
 void test__memmove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memmove(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; memmove(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19019,8 +19019,8 @@ void test__memmove__arg3__notuninit() {
 }
 
 void test__std__memmove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::memmove(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::memmove(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19059,8 +19059,8 @@ void test__std__memmove__arg3__notuninit() {
 }
 
 void test__wmemmove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wmemmove(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wmemmove(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19099,8 +19099,8 @@ void test__wmemmove__arg3__notuninit() {
 }
 
 void test__std__wmemmove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wmemmove(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wmemmove(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19139,8 +19139,8 @@ void test__std__wmemmove__arg3__notuninit() {
 }
 
 void test__memset_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memset_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; memset_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19175,8 +19175,8 @@ void test__memset_s__arg4__notuninit() {
 }
 
 void test__memset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else memset(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; memset(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19210,8 +19210,8 @@ void test__memset__arg3__notuninit() {
 }
 
 void test__std__memset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::memset(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::memset(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19245,8 +19245,8 @@ void test__std__memset__arg3__notuninit() {
 }
 
 void test__wmemset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wmemset(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wmemset(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19280,8 +19280,8 @@ void test__wmemset__arg3__notuninit() {
 }
 
 void test__std__wmemset__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wmemset(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wmemset(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19315,8 +19315,8 @@ void test__std__wmemset__arg3__notuninit() {
 }
 
 void test__mktime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mktime(arg1);
+  int x = 1;
+  if (cond) { x=100; mktime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19339,8 +19339,8 @@ void test__mktime__arg1__notuninit() {
 }
 
 void test__std__mktime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mktime(arg1);
+  int x = 1;
+  if (cond) { x=100; std::mktime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19363,8 +19363,8 @@ void test__std__mktime__arg1__notuninit() {
 }
 
 void test__mkxtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mkxtime(arg1);
+  int x = 1;
+  if (cond) { x=100; mkxtime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19387,8 +19387,8 @@ void test__mkxtime__arg1__notuninit() {
 }
 
 void test__modf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else modf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; modf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19411,8 +19411,8 @@ void test__modf__arg2__notnull() {
 }
 
 void test__std__modf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::modf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::modf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19435,8 +19435,8 @@ void test__std__modf__arg2__notnull() {
 }
 
 void test__modff__noreturn() {
-  int x = 100;
-  if (cond) x=1; else modff(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; modff(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19459,8 +19459,8 @@ void test__modff__arg2__notnull() {
 }
 
 void test__std__modff__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::modff(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::modff(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19483,8 +19483,8 @@ void test__std__modff__arg2__notnull() {
 }
 
 void test__modfl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else modfl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; modfl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19507,8 +19507,8 @@ void test__modfl__arg2__notnull() {
 }
 
 void test__std__modfl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::modfl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::modfl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19531,8 +19531,8 @@ void test__std__modfl__arg2__notnull() {
 }
 
 void test__perror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else perror(arg1);
+  int x = 1;
+  if (cond) { x=100; perror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19550,8 +19550,8 @@ void test__perror__arg1__notuninit() {
 }
 
 void test__std__perror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::perror(arg1);
+  int x = 1;
+  if (cond) { x=100; std::perror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19569,8 +19569,8 @@ void test__std__perror__arg1__notuninit() {
 }
 
 void test__pow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = pow(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = pow(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19604,8 +19604,8 @@ void test__pow__arg2__notuninit() {
 }
 
 void test__std__pow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::pow(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::pow(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19639,8 +19639,8 @@ void test__std__pow__arg2__notuninit() {
 }
 
 void test__powf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = powf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = powf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19674,8 +19674,8 @@ void test__powf__arg2__notuninit() {
 }
 
 void test__std__powf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::powf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::powf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19709,8 +19709,8 @@ void test__std__powf__arg2__notuninit() {
 }
 
 void test__powl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = powl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = powl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19744,8 +19744,8 @@ void test__powl__arg2__notuninit() {
 }
 
 void test__std__powl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::powl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::powl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19779,8 +19779,8 @@ void test__std__powl__arg2__notuninit() {
 }
 
 void test__cpow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cpow(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = cpow(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19814,8 +19814,8 @@ void test__cpow__arg2__notuninit() {
 }
 
 void test__cpowf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cpowf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = cpowf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19849,8 +19849,8 @@ void test__cpowf__arg2__notuninit() {
 }
 
 void test__cpowl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = cpowl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = cpowl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19884,8 +19884,8 @@ void test__cpowl__arg2__notuninit() {
 }
 
 void test__remainder__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remainder(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = remainder(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19919,8 +19919,8 @@ void test__remainder__arg2__notuninit() {
 }
 
 void test__std__remainder__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remainder(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::remainder(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19954,8 +19954,8 @@ void test__std__remainder__arg2__notuninit() {
 }
 
 void test__remainderf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remainderf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = remainderf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -19989,8 +19989,8 @@ void test__remainderf__arg2__notuninit() {
 }
 
 void test__std__remainderf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remainderf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::remainderf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20024,8 +20024,8 @@ void test__std__remainderf__arg2__notuninit() {
 }
 
 void test__remainderl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remainderl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = remainderl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20059,8 +20059,8 @@ void test__remainderl__arg2__notuninit() {
 }
 
 void test__std__remainderl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remainderl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::remainderl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20094,8 +20094,8 @@ void test__std__remainderl__arg2__notuninit() {
 }
 
 void test__remquo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remquo(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = remquo(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20134,8 +20134,8 @@ void test__remquo__arg3__notnull() {
 }
 
 void test__std__remquo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remquo(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::remquo(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20174,8 +20174,8 @@ void test__std__remquo__arg3__notnull() {
 }
 
 void test__remquof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remquof(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = remquof(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20214,8 +20214,8 @@ void test__remquof__arg3__notnull() {
 }
 
 void test__std__remquof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remquof(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::remquof(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20254,8 +20254,8 @@ void test__std__remquof__arg3__notnull() {
 }
 
 void test__remquol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = remquol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = remquol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20294,8 +20294,8 @@ void test__remquol__arg3__notnull() {
 }
 
 void test__std__remquol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::remquol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::remquol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20334,8 +20334,8 @@ void test__std__remquol__arg3__notnull() {
 }
 
 void test__printf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else printf(arg1);
+  int x = 1;
+  if (cond) { x=100; printf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20353,8 +20353,8 @@ void test__printf__arg1__notuninit() {
 }
 
 void test__std__printf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::printf(arg1);
+  int x = 1;
+  if (cond) { x=100; std::printf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20372,8 +20372,8 @@ void test__std__printf__arg1__notuninit() {
 }
 
 void test__vprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20391,8 +20391,8 @@ void test__vprintf__arg1__notuninit() {
 }
 
 void test__std__vprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::vprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20410,8 +20410,8 @@ void test__std__vprintf__arg1__notuninit() {
 }
 
 void test__vwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vwprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vwprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20429,8 +20429,8 @@ void test__vwprintf__arg1__notuninit() {
 }
 
 void test__std__vwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vwprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::vwprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20448,8 +20448,8 @@ void test__std__vwprintf__arg1__notuninit() {
 }
 
 void test__bsearch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = bsearch(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = bsearch(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20516,8 +20516,8 @@ void test__bsearch__arg5__notuninit() {
 }
 
 void test__std__bsearch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::bsearch(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = std::bsearch(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20584,8 +20584,8 @@ void test__std__bsearch__arg5__notuninit() {
 }
 
 void test__qsort__noreturn() {
-  int x = 100;
-  if (cond) x=1; else qsort(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; qsort(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20631,8 +20631,8 @@ void test__qsort__arg4__notuninit() {
 }
 
 void test__std__qsort__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::qsort(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::qsort(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20678,8 +20678,8 @@ void test__std__qsort__arg4__notuninit() {
 }
 
 void test__putc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else putc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; putc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20713,8 +20713,8 @@ void test__putc__arg2__notuninit() {
 }
 
 void test__std__putc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::putc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::putc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20748,8 +20748,8 @@ void test__std__putc__arg2__notuninit() {
 }
 
 void test__putwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else putwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; putwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20778,8 +20778,8 @@ void test__putwc__arg2__notuninit() {
 }
 
 void test__std__putwc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::putwc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::putwc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20808,8 +20808,8 @@ void test__std__putwc__arg2__notuninit() {
 }
 
 void test__putchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else putchar(arg1);
+  int x = 1;
+  if (cond) { x=100; putchar(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20832,8 +20832,8 @@ void test__putchar__arg1__notuninit() {
 }
 
 void test__std__putchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::putchar(arg1);
+  int x = 1;
+  if (cond) { x=100; std::putchar(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20856,8 +20856,8 @@ void test__std__putchar__arg1__notuninit() {
 }
 
 void test__putwchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else putwchar(arg1);
+  int x = 1;
+  if (cond) { x=100; putwchar(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20875,8 +20875,8 @@ void test__putwchar__arg1__notuninit() {
 }
 
 void test__std__putwchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::putwchar(arg1);
+  int x = 1;
+  if (cond) { x=100; std::putwchar(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20894,8 +20894,8 @@ void test__std__putwchar__arg1__notuninit() {
 }
 
 void test__puts__noreturn() {
-  int x = 100;
-  if (cond) x=1; else puts(arg1);
+  int x = 1;
+  if (cond) { x=100; puts(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20923,8 +20923,8 @@ void test__puts__arg1__notuninit() {
 }
 
 void test__std__puts__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::puts(arg1);
+  int x = 1;
+  if (cond) { x=100; std::puts(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20952,8 +20952,8 @@ void test__std__puts__arg1__notuninit() {
 }
 
 void test__realloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else realloc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; realloc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20971,8 +20971,8 @@ void test__realloc__arg2__notuninit() {
 }
 
 void test__std__realloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::realloc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::realloc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -20990,8 +20990,8 @@ void test__std__realloc__arg2__notuninit() {
 }
 
 void test__remove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else remove(arg1);
+  int x = 1;
+  if (cond) { x=100; remove(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21014,8 +21014,8 @@ void test__remove__arg1__notuninit() {
 }
 
 void test__std__remove__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::remove(arg1);
+  int x = 1;
+  if (cond) { x=100; std::remove(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21038,8 +21038,8 @@ void test__std__remove__arg1__notuninit() {
 }
 
 void test__rename__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rename(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; rename(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21073,8 +21073,8 @@ void test__rename__arg2__notuninit() {
 }
 
 void test__std__rename__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::rename(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::rename(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21108,8 +21108,8 @@ void test__std__rename__arg2__notuninit() {
 }
 
 void test__rewind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else rewind(arg1);
+  int x = 1;
+  if (cond) { x=100; rewind(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21132,8 +21132,8 @@ void test__rewind__arg1__notuninit() {
 }
 
 void test__std__rewind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::rewind(arg1);
+  int x = 1;
+  if (cond) { x=100; std::rewind(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21156,8 +21156,8 @@ void test__std__rewind__arg1__notuninit() {
 }
 
 void test__round__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = round(arg1);
+  int x = 1;
+  if (cond) { x=100; result = round(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21185,8 +21185,8 @@ void test__round__arg1__notuninit() {
 }
 
 void test__std__round__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::round(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::round(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21214,8 +21214,8 @@ void test__std__round__arg1__notuninit() {
 }
 
 void test__roundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = roundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = roundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21243,8 +21243,8 @@ void test__roundf__arg1__notuninit() {
 }
 
 void test__std__roundf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::roundf(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::roundf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21272,8 +21272,8 @@ void test__std__roundf__arg1__notuninit() {
 }
 
 void test__roundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = roundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = roundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21301,8 +21301,8 @@ void test__roundl__arg1__notuninit() {
 }
 
 void test__std__roundl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::roundl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::roundl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21330,8 +21330,8 @@ void test__std__roundl__arg1__notuninit() {
 }
 
 void test__scalbn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalbn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalbn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21365,8 +21365,8 @@ void test__scalbn__arg2__notuninit() {
 }
 
 void test__std__scalbn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalbn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalbn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21400,8 +21400,8 @@ void test__std__scalbn__arg2__notuninit() {
 }
 
 void test__scalbnf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalbnf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalbnf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21435,8 +21435,8 @@ void test__scalbnf__arg2__notuninit() {
 }
 
 void test__std__scalbnf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalbnf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalbnf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21470,8 +21470,8 @@ void test__std__scalbnf__arg2__notuninit() {
 }
 
 void test__scalbnl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalbnl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalbnl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21505,8 +21505,8 @@ void test__scalbnl__arg2__notuninit() {
 }
 
 void test__std__scalbnl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalbnl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalbnl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21540,8 +21540,8 @@ void test__std__scalbnl__arg2__notuninit() {
 }
 
 void test__scalbln__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalbln(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalbln(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21575,8 +21575,8 @@ void test__scalbln__arg2__notuninit() {
 }
 
 void test__std__scalbln__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalbln(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalbln(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21610,8 +21610,8 @@ void test__std__scalbln__arg2__notuninit() {
 }
 
 void test__scalblnf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalblnf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalblnf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21645,8 +21645,8 @@ void test__scalblnf__arg2__notuninit() {
 }
 
 void test__std__scalblnf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalblnf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalblnf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21680,8 +21680,8 @@ void test__std__scalblnf__arg2__notuninit() {
 }
 
 void test__scalblnl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = scalblnl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = scalblnl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21715,8 +21715,8 @@ void test__scalblnl__arg2__notuninit() {
 }
 
 void test__std__scalblnl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::scalblnl(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::scalblnl(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21750,8 +21750,8 @@ void test__std__scalblnl__arg2__notuninit() {
 }
 
 void test__signbit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = signbit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = signbit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21779,8 +21779,8 @@ void test__signbit__arg1__notuninit() {
 }
 
 void test__std__signbit__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::signbit(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::signbit(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21808,8 +21808,8 @@ void test__std__signbit__arg1__notuninit() {
 }
 
 void test__signal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else signal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; signal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21821,8 +21821,8 @@ void test__signal__arg1__notuninit() {
 }
 
 void test__std__signal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::signal(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::signal(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21834,8 +21834,8 @@ void test__std__signal__arg1__notuninit() {
 }
 
 void test__raise__noreturn() {
-  int x = 100;
-  if (cond) x=1; else raise(arg1);
+  int x = 1;
+  if (cond) { x=100; raise(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21847,8 +21847,8 @@ void test__raise__arg1__notuninit() {
 }
 
 void test__std__raise__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::raise(arg1);
+  int x = 1;
+  if (cond) { x=100; std::raise(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21860,8 +21860,8 @@ void test__std__raise__arg1__notuninit() {
 }
 
 void test__scanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else scanf(arg1);
+  int x = 1;
+  if (cond) { x=100; scanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21884,8 +21884,8 @@ void test__scanf__arg1__notuninit() {
 }
 
 void test__std__scanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::scanf(arg1);
+  int x = 1;
+  if (cond) { x=100; std::scanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21908,8 +21908,8 @@ void test__std__scanf__arg1__notuninit() {
 }
 
 void test__vsscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vsscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21943,8 +21943,8 @@ void test__vsscanf__arg2__notuninit() {
 }
 
 void test__std__vsscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vsscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vsscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -21978,8 +21978,8 @@ void test__std__vsscanf__arg2__notuninit() {
 }
 
 void test__vswscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vswscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vswscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22013,8 +22013,8 @@ void test__vswscanf__arg2__notuninit() {
 }
 
 void test__std__vswscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vswscanf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vswscanf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22048,8 +22048,8 @@ void test__std__vswscanf__arg2__notuninit() {
 }
 
 void test__vscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22072,8 +22072,8 @@ void test__vscanf__arg1__notuninit() {
 }
 
 void test__std__vscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::vscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22096,8 +22096,8 @@ void test__std__vscanf__arg1__notuninit() {
 }
 
 void test__vwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vwscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; vwscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22114,8 +22114,8 @@ void test__vwscanf__arg1__notnull() {
 }
 
 void test__std__vwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vwscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::vwscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22132,8 +22132,8 @@ void test__std__vwscanf__arg1__notnull() {
 }
 
 void test__setbuf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setbuf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setbuf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22161,8 +22161,8 @@ void test__setbuf__arg2__notbool() {
 }
 
 void test__std__setbuf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setbuf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::setbuf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22190,8 +22190,8 @@ void test__std__setbuf__arg2__notbool() {
 }
 
 void test__setvbuf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setvbuf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; setvbuf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22232,8 +22232,8 @@ void test__setvbuf__arg4__notuninit() {
 }
 
 void test__std__setvbuf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setvbuf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::setvbuf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22274,8 +22274,8 @@ void test__std__setvbuf__arg4__notuninit() {
 }
 
 void test__setjmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setjmp(arg1);
+  int x = 1;
+  if (cond) { x=100; setjmp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22287,8 +22287,8 @@ void test__setjmp__leakignore() {
 }
 
 void test__strcat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strcat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strcat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22322,8 +22322,8 @@ void test__strcat__arg2__notuninit() {
 }
 
 void test__std__strcat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strcat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strcat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22357,8 +22357,8 @@ void test__std__strcat__arg2__notuninit() {
 }
 
 void test__wcscat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcscat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wcscat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22386,8 +22386,8 @@ void test__wcscat__arg2__notuninit() {
 }
 
 void test__std__wcscat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcscat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::wcscat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22415,8 +22415,8 @@ void test__std__wcscat__arg2__notuninit() {
 }
 
 void test__wcrtomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcrtomb(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcrtomb(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22434,8 +22434,8 @@ void test__wcrtomb__arg2__notuninit() {
 }
 
 void test__std__wcrtomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcrtomb(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcrtomb(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22453,8 +22453,8 @@ void test__std__wcrtomb__arg2__notuninit() {
 }
 
 void test__strchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22488,8 +22488,8 @@ void test__strchr__arg2__notuninit() {
 }
 
 void test__std__strchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22523,8 +22523,8 @@ void test__std__strchr__arg2__notuninit() {
 }
 
 void test__wcschr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcschr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcschr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22558,8 +22558,8 @@ void test__wcschr__arg2__notuninit() {
 }
 
 void test__std__wcschr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcschr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcschr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22593,8 +22593,8 @@ void test__std__wcschr__arg2__notuninit() {
 }
 
 void test__strcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strcmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strcmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22638,8 +22638,8 @@ void test__strcmp__arg2__notuninit() {
 }
 
 void test__std__strcmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strcmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strcmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22683,8 +22683,8 @@ void test__std__strcmp__arg2__notuninit() {
 }
 
 void test__wcscmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcscmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcscmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22728,8 +22728,8 @@ void test__wcscmp__arg2__notuninit() {
 }
 
 void test__std__wcscmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcscmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcscmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22773,8 +22773,8 @@ void test__std__wcscmp__arg2__notuninit() {
 }
 
 void test__strcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strcpy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strcpy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22802,8 +22802,8 @@ void test__strcpy__arg2__notuninit() {
 }
 
 void test__std__strcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strcpy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strcpy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22831,8 +22831,8 @@ void test__std__strcpy__arg2__notuninit() {
 }
 
 void test__wcscpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcscpy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wcscpy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22860,8 +22860,8 @@ void test__wcscpy__arg2__notuninit() {
 }
 
 void test__std__wcscpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcscpy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::wcscpy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22889,8 +22889,8 @@ void test__std__wcscpy__arg2__notuninit() {
 }
 
 void test__strftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strftime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; strftime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22935,8 +22935,8 @@ void test__strftime__arg4__notuninit() {
 }
 
 void test__std__strftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strftime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::strftime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -22981,8 +22981,8 @@ void test__std__strftime__arg4__notuninit() {
 }
 
 void test__strfxtime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strfxtime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; strfxtime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23027,8 +23027,8 @@ void test__strfxtime__arg4__notuninit() {
 }
 
 void test__strlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strlen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = strlen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23061,8 +23061,8 @@ void test__strlen__arg1__notuninit() {
 }
 
 void test__std__strlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strlen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::strlen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23095,8 +23095,8 @@ void test__std__strlen__arg1__notuninit() {
 }
 
 void test__wcslen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcslen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wcslen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23129,8 +23129,8 @@ void test__wcslen__arg1__notuninit() {
 }
 
 void test__std__wcslen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcslen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::wcslen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23163,8 +23163,8 @@ void test__std__wcslen__arg1__notuninit() {
 }
 
 void test__strncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23203,8 +23203,8 @@ void test__strncpy__arg3__notuninit() {
 }
 
 void test__std__strncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23243,8 +23243,8 @@ void test__std__strncpy__arg3__notuninit() {
 }
 
 void test__strpbrk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strpbrk(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strpbrk(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23283,8 +23283,8 @@ void test__strpbrk__arg2__notuninit() {
 }
 
 void test__std__strpbrk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strpbrk(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strpbrk(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23323,8 +23323,8 @@ void test__std__strpbrk__arg2__notuninit() {
 }
 
 void test__strncat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strncat(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strncat(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23369,8 +23369,8 @@ void test__strncat__arg3__notuninit() {
 }
 
 void test__std__strncat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strncat(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strncat(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23415,8 +23415,8 @@ void test__std__strncat__arg3__notuninit() {
 }
 
 void test__wcsncat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsncat(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcsncat(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23461,8 +23461,8 @@ void test__wcsncat__arg3__notuninit() {
 }
 
 void test__std__wcsncat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcsncat(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcsncat(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23507,8 +23507,8 @@ void test__std__wcsncat__arg3__notuninit() {
 }
 
 void test__strncmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strncmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = strncmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23563,8 +23563,8 @@ void test__strncmp__arg3__notuninit() {
 }
 
 void test__std__strncmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strncmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::strncmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23619,8 +23619,8 @@ void test__std__strncmp__arg3__notuninit() {
 }
 
 void test__wcsncmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsncmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = wcsncmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23675,8 +23675,8 @@ void test__wcsncmp__arg3__notuninit() {
 }
 
 void test__std__wcsncmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcsncmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wcsncmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23731,8 +23731,8 @@ void test__std__wcsncmp__arg3__notuninit() {
 }
 
 void test__strstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23771,8 +23771,8 @@ void test__strstr__arg2__notuninit() {
 }
 
 void test__std__strstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23811,8 +23811,8 @@ void test__std__strstr__arg2__notuninit() {
 }
 
 void test__wcsstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcsstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23856,8 +23856,8 @@ void test__wcsstr__arg2__notuninit() {
 }
 
 void test__std__wcsstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcsstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcsstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23901,8 +23901,8 @@ void test__std__wcsstr__arg2__notuninit() {
 }
 
 void test__strspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23941,8 +23941,8 @@ void test__strspn__arg2__notuninit() {
 }
 
 void test__std__strspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -23981,8 +23981,8 @@ void test__std__strspn__arg2__notuninit() {
 }
 
 void test__strxfrm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strxfrm(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strxfrm(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24011,8 +24011,8 @@ void test__strxfrm__arg3__notuninit() {
 }
 
 void test__std__strxfrm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strxfrm(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strxfrm(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24041,8 +24041,8 @@ void test__std__strxfrm__arg3__notuninit() {
 }
 
 void test__wcsxfrm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsxfrm(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcsxfrm(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24071,8 +24071,8 @@ void test__wcsxfrm__arg3__notuninit() {
 }
 
 void test__std__wcsxfrm__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcsxfrm(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcsxfrm(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24101,8 +24101,8 @@ void test__std__wcsxfrm__arg3__notuninit() {
 }
 
 void test__wcsspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcsspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24146,8 +24146,8 @@ void test__wcsspn__arg2__notuninit() {
 }
 
 void test__std__wcsspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcsspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcsspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24191,8 +24191,8 @@ void test__std__wcsspn__arg2__notuninit() {
 }
 
 void test__localeconv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = localeconv();
+  int x = 1;
+  if (cond) { x=100; result = localeconv(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24209,8 +24209,8 @@ void test__localeconv__leakignore() {
 }
 
 void test__std__localeconv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::localeconv();
+  int x = 1;
+  if (cond) { x=100; result = std::localeconv(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24227,8 +24227,8 @@ void test__std__localeconv__leakignore() {
 }
 
 void test__std__locale__global__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::locale::global(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::locale::global(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24251,8 +24251,8 @@ void test__std__locale__global__arg1__notuninit() {
 }
 
 void test__std__locale__classic__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::locale::classic();
+  int x = 1;
+  if (cond) { x=100; result = std::locale::classic(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24269,8 +24269,8 @@ void test__std__locale__classic__leakignore() {
 }
 
 void test__setlocale__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setlocale(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; setlocale(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24294,8 +24294,8 @@ void test__setlocale__arg2__notuninit() {
 }
 
 void test__std__setlocale__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setlocale(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::setlocale(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24319,8 +24319,8 @@ void test__std__setlocale__arg2__notuninit() {
 }
 
 void test__strerror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strerror(arg1);
+  int x = 1;
+  if (cond) { x=100; result = strerror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24343,8 +24343,8 @@ void test__strerror__arg1__notuninit() {
 }
 
 void test__std__strerror__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strerror(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::strerror(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24367,8 +24367,8 @@ void test__std__strerror__arg1__notuninit() {
 }
 
 void test__strcspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strcspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strcspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24412,8 +24412,8 @@ void test__strcspn__arg2__notuninit() {
 }
 
 void test__std__strcspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strcspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strcspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24457,8 +24457,8 @@ void test__std__strcspn__arg2__notuninit() {
 }
 
 void test__wcscspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcscspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcscspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24502,8 +24502,8 @@ void test__wcscspn__arg2__notuninit() {
 }
 
 void test__std__wcscspn__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcscspn(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcscspn(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24547,8 +24547,8 @@ void test__std__wcscspn__arg2__notuninit() {
 }
 
 void test__wcspbrk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcspbrk(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcspbrk(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24582,8 +24582,8 @@ void test__wcspbrk__arg2__notuninit() {
 }
 
 void test__std__wcspbrk__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcspbrk(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcspbrk(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24617,8 +24617,8 @@ void test__std__wcspbrk__arg2__notuninit() {
 }
 
 void test__wcsncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcsncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24657,8 +24657,8 @@ void test__wcsncpy__arg3__notuninit() {
 }
 
 void test__std__wcsncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcsncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcsncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24697,8 +24697,8 @@ void test__std__wcsncpy__arg3__notuninit() {
 }
 
 void test__strcoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strcoll(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strcoll(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24737,8 +24737,8 @@ void test__strcoll__arg2__notuninit() {
 }
 
 void test__std__strcoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strcoll(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strcoll(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24777,8 +24777,8 @@ void test__std__strcoll__arg2__notuninit() {
 }
 
 void test__wcscoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcscoll(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcscoll(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24817,8 +24817,8 @@ void test__wcscoll__arg2__notuninit() {
 }
 
 void test__std__wcscoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcscoll(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcscoll(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24857,8 +24857,8 @@ void test__std__wcscoll__arg2__notuninit() {
 }
 
 void test__strrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24892,8 +24892,8 @@ void test__strrchr__arg2__notuninit() {
 }
 
 void test__std__strrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::strrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::strrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24927,8 +24927,8 @@ void test__std__strrchr__arg2__notuninit() {
 }
 
 void test__wcsrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcsrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24962,8 +24962,8 @@ void test__wcsrchr__arg2__notuninit() {
 }
 
 void test__std__wcsrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcsrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcsrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -24997,8 +24997,8 @@ void test__std__wcsrchr__arg2__notuninit() {
 }
 
 void test__wcsrtombs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsrtombs(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; wcsrtombs(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25032,8 +25032,8 @@ void test__wcsrtombs__arg4__notnull() {
 }
 
 void test__std__wcsrtombs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcsrtombs(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::wcsrtombs(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25067,8 +25067,8 @@ void test__std__wcsrtombs__arg4__notnull() {
 }
 
 void test__strtok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtok(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strtok(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25102,8 +25102,8 @@ void test__strtok__arg2__notuninit() {
 }
 
 void test__std__strtok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtok(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strtok(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25137,8 +25137,8 @@ void test__std__strtok__arg2__notuninit() {
 }
 
 void test__strtof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strtof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25161,8 +25161,8 @@ void test__strtof__arg1__notuninit() {
 }
 
 void test__std__strtof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strtof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25185,8 +25185,8 @@ void test__std__strtof__arg1__notuninit() {
 }
 
 void test__strtod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strtod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25209,8 +25209,8 @@ void test__strtod__arg1__notuninit() {
 }
 
 void test__std__strtod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strtod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25233,8 +25233,8 @@ void test__std__strtod__arg1__notuninit() {
 }
 
 void test__strtold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; strtold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25257,8 +25257,8 @@ void test__strtold__arg1__notuninit() {
 }
 
 void test__std__strtold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::strtold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25281,8 +25281,8 @@ void test__std__strtold__arg1__notuninit() {
 }
 
 void test__strtol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25311,8 +25311,8 @@ void test__strtol__arg3__notuninit() {
 }
 
 void test__std__strtol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25341,8 +25341,8 @@ void test__std__strtol__arg3__notuninit() {
 }
 
 void test__strtoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25371,8 +25371,8 @@ void test__strtoul__arg3__notuninit() {
 }
 
 void test__std__strtoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25401,8 +25401,8 @@ void test__std__strtoul__arg3__notuninit() {
 }
 
 void test__strtoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25431,8 +25431,8 @@ void test__strtoll__arg3__notuninit() {
 }
 
 void test__std__strtoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25461,8 +25461,8 @@ void test__std__strtoll__arg3__notuninit() {
 }
 
 void test__strtoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25491,8 +25491,8 @@ void test__strtoull__arg3__notuninit() {
 }
 
 void test__std__strtoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25521,8 +25521,8 @@ void test__std__strtoull__arg3__notuninit() {
 }
 
 void test__strtoimax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtoimax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtoimax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25551,8 +25551,8 @@ void test__strtoimax__arg3__notuninit() {
 }
 
 void test__std__strtoimax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtoimax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtoimax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25581,8 +25581,8 @@ void test__std__strtoimax__arg3__notuninit() {
 }
 
 void test__strtoumax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtoumax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtoumax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25611,8 +25611,8 @@ void test__strtoumax__arg3__notuninit() {
 }
 
 void test__std__strtoumax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::strtoumax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::strtoumax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25641,8 +25641,8 @@ void test__std__strtoumax__arg3__notuninit() {
 }
 
 void test__time__noreturn() {
-  int x = 100;
-  if (cond) x=1; else time(arg1);
+  int x = 1;
+  if (cond) { x=100; time(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25660,8 +25660,8 @@ void test__time__arg1__notuninit() {
 }
 
 void test__std__time__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::time(arg1);
+  int x = 1;
+  if (cond) { x=100; std::time(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25679,8 +25679,8 @@ void test__std__time__arg1__notuninit() {
 }
 
 void test__tmpnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tmpnam(arg1);
+  int x = 1;
+  if (cond) { x=100; tmpnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25698,8 +25698,8 @@ void test__tmpnam__arg1__notuninit() {
 }
 
 void test__std__tmpnam__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::tmpnam(arg1);
+  int x = 1;
+  if (cond) { x=100; std::tmpnam(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25717,8 +25717,8 @@ void test__std__tmpnam__arg1__notuninit() {
 }
 
 void test__tmpnam_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else tmpnam_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; tmpnam_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25742,8 +25742,8 @@ void test__tmpnam_s__arg2__notuninit() {
 }
 
 void test__tmpfile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tmpfile();
+  int x = 1;
+  if (cond) { x=100; result = tmpfile(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25754,8 +25754,8 @@ void test__tmpfile__useretval() {
 }
 
 void test__tolower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = tolower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = tolower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25778,8 +25778,8 @@ void test__tolower__arg1__notuninit() {
 }
 
 void test__std__tolower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::tolower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::tolower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25802,8 +25802,8 @@ void test__std__tolower__arg1__notuninit() {
 }
 
 void test__toupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = toupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = toupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25826,8 +25826,8 @@ void test__toupper__arg1__notuninit() {
 }
 
 void test__std__toupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::toupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::toupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25850,8 +25850,8 @@ void test__std__toupper__arg1__notuninit() {
 }
 
 void test__typeid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = typeid(arg1);
+  int x = 1;
+  if (cond) { x=100; result = typeid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25862,8 +25862,8 @@ void test__typeid__useretval() {
 }
 
 void test__va_arg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else va_arg(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; va_arg(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25875,8 +25875,8 @@ void test__va_arg__leakignore() {
 }
 
 void test__va_copy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else va_copy(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; va_copy(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25888,8 +25888,8 @@ void test__va_copy__leakignore() {
 }
 
 void test__va_end__noreturn() {
-  int x = 100;
-  if (cond) x=1; else va_end(arg1);
+  int x = 1;
+  if (cond) { x=100; va_end(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25901,8 +25901,8 @@ void test__va_end__leakignore() {
 }
 
 void test__va_start__noreturn() {
-  int x = 100;
-  if (cond) x=1; else va_start(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; va_start(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25914,8 +25914,8 @@ void test__va_start__leakignore() {
 }
 
 void test__wcstof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcstof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcstof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25943,8 +25943,8 @@ void test__wcstof__arg1__notuninit() {
 }
 
 void test__std__wcstof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcstof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcstof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -25972,8 +25972,8 @@ void test__std__wcstof__arg1__notuninit() {
 }
 
 void test__wcstod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcstod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcstod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26001,8 +26001,8 @@ void test__wcstod__arg1__notuninit() {
 }
 
 void test__std__wcstod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcstod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcstod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26030,8 +26030,8 @@ void test__std__wcstod__arg1__notuninit() {
 }
 
 void test__wcstold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcstold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcstold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26059,8 +26059,8 @@ void test__wcstold__arg1__notuninit() {
 }
 
 void test__std__wcstold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcstold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wcstold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26088,8 +26088,8 @@ void test__std__wcstold__arg1__notuninit() {
 }
 
 void test__stof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = stof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26118,8 +26118,8 @@ void test__stof__arg2__notuninit() {
 }
 
 void test__std__stof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::stof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26148,8 +26148,8 @@ void test__std__stof__arg2__notuninit() {
 }
 
 void test__stod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = stod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26178,8 +26178,8 @@ void test__stod__arg2__notuninit() {
 }
 
 void test__std__stod__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stod(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::stod(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26208,8 +26208,8 @@ void test__std__stod__arg2__notuninit() {
 }
 
 void test__stold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = stold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26238,8 +26238,8 @@ void test__stold__arg2__notuninit() {
 }
 
 void test__std__stold__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stold(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::stold(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26268,8 +26268,8 @@ void test__std__stold__arg2__notuninit() {
 }
 
 void test__stoi__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stoi(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = stoi(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26304,8 +26304,8 @@ void test__stoi__arg3__notuninit() {
 }
 
 void test__std__stoi__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stoi(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::stoi(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26340,8 +26340,8 @@ void test__std__stoi__arg3__notuninit() {
 }
 
 void test__stol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = stol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26376,8 +26376,8 @@ void test__stol__arg3__notuninit() {
 }
 
 void test__std__stol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::stol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26412,8 +26412,8 @@ void test__std__stol__arg3__notuninit() {
 }
 
 void test__stoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = stoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26448,8 +26448,8 @@ void test__stoll__arg3__notuninit() {
 }
 
 void test__std__stoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::stoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26484,8 +26484,8 @@ void test__std__stoll__arg3__notuninit() {
 }
 
 void test__stoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = stoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26520,8 +26520,8 @@ void test__stoul__arg3__notuninit() {
 }
 
 void test__std__stoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::stoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26556,8 +26556,8 @@ void test__std__stoul__arg3__notuninit() {
 }
 
 void test__stoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = stoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = stoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26592,8 +26592,8 @@ void test__stoull__arg3__notuninit() {
 }
 
 void test__std__stoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::stoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26628,8 +26628,8 @@ void test__std__stoull__arg3__notuninit() {
 }
 
 void test__std__to_string__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::to_string(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::to_string(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26652,8 +26652,8 @@ void test__std__to_string__arg1__notuninit() {
 }
 
 void test__std__string__resize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::resize(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::string::resize(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26677,8 +26677,8 @@ void test__std__string__resize__arg2__notuninit() {
 }
 
 void test__std__wstring__resize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wstring::resize(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::wstring::resize(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26702,8 +26702,8 @@ void test__std__wstring__resize__arg2__notuninit() {
 }
 
 void test__std__to_wstring__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::to_wstring(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::to_wstring(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26726,8 +26726,8 @@ void test__std__to_wstring__arg1__notuninit() {
 }
 
 void test__mbrtowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbrtowc(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mbrtowc(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26757,8 +26757,8 @@ void test__mbrtowc__arg4__notuninit() {
 }
 
 void test__std__mbrtowc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::mbrtowc(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::mbrtowc(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26788,8 +26788,8 @@ void test__std__mbrtowc__arg4__notuninit() {
 }
 
 void test__wcstok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstok(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstok(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26823,8 +26823,8 @@ void test__wcstok__arg3__notnull() {
 }
 
 void test__std__wcstok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstok(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstok(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26858,8 +26858,8 @@ void test__std__wcstok__arg3__notnull() {
 }
 
 void test__wcstoimax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcstoimax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = wcstoimax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26893,8 +26893,8 @@ void test__wcstoimax__arg3__notuninit() {
 }
 
 void test__std__wcstoimax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcstoimax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wcstoimax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26928,8 +26928,8 @@ void test__std__wcstoimax__arg3__notuninit() {
 }
 
 void test__wcstoumax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcstoumax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = wcstoumax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26963,8 +26963,8 @@ void test__wcstoumax__arg3__notuninit() {
 }
 
 void test__std__wcstoumax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wcstoumax(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wcstoumax(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -26998,8 +26998,8 @@ void test__std__wcstoumax__arg3__notuninit() {
 }
 
 void test__wcstol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27028,8 +27028,8 @@ void test__wcstol__arg3__notuninit() {
 }
 
 void test__std__wcstol__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstol(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstol(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27058,8 +27058,8 @@ void test__std__wcstol__arg3__notuninit() {
 }
 
 void test__wcstoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27088,8 +27088,8 @@ void test__wcstoll__arg3__notuninit() {
 }
 
 void test__std__wcstoll__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstoll(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstoll(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27118,8 +27118,8 @@ void test__std__wcstoll__arg3__notuninit() {
 }
 
 void test__wcstoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27148,8 +27148,8 @@ void test__wcstoul__arg3__notuninit() {
 }
 
 void test__std__wcstoul__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstoul(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstoul(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27178,8 +27178,8 @@ void test__std__wcstoul__arg3__notuninit() {
 }
 
 void test__wcstoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27208,8 +27208,8 @@ void test__wcstoull__arg3__notuninit() {
 }
 
 void test__std__wcstoull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wcstoull(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::wcstoull(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27238,8 +27238,8 @@ void test__std__wcstoull__arg3__notuninit() {
 }
 
 void test__wprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wprintf(arg1);
+  int x = 1;
+  if (cond) { x=100; wprintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27256,8 +27256,8 @@ void test__wprintf__arg1__notnull() {
 }
 
 void test__std__wprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wprintf(arg1);
+  int x = 1;
+  if (cond) { x=100; std::wprintf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27274,8 +27274,8 @@ void test__std__wprintf__arg1__notnull() {
 }
 
 void test__sprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27304,8 +27304,8 @@ void test__sprintf__arg2__notuninit() {
 }
 
 void test__std__sprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::sprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::sprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27334,8 +27334,8 @@ void test__std__sprintf__arg2__notuninit() {
 }
 
 void test__swprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else swprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; swprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27370,8 +27370,8 @@ void test__swprintf__arg3__notuninit() {
 }
 
 void test__std__swprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::swprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::swprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27406,8 +27406,8 @@ void test__std__swprintf__arg3__notuninit() {
 }
 
 void test__vsprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vsprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27435,8 +27435,8 @@ void test__vsprintf__arg2__notuninit() {
 }
 
 void test__std__vsprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vsprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::vsprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27464,8 +27464,8 @@ void test__std__vsprintf__arg2__notuninit() {
 }
 
 void test__vswprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vswprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; vswprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27499,8 +27499,8 @@ void test__vswprintf__arg3__notuninit() {
 }
 
 void test__std__vswprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vswprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::vswprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27534,8 +27534,8 @@ void test__std__vswprintf__arg3__notuninit() {
 }
 
 void test__fwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fwprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27563,8 +27563,8 @@ void test__fwprintf__arg2__notuninit() {
 }
 
 void test__std__fwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fwprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fwprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27592,8 +27592,8 @@ void test__std__fwprintf__arg2__notuninit() {
 }
 
 void test__snprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else snprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; snprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27622,8 +27622,8 @@ void test__snprintf__arg3__notuninit() {
 }
 
 void test__std__snprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::snprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::snprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27652,8 +27652,8 @@ void test__std__snprintf__arg3__notuninit() {
 }
 
 void test__vsnprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsnprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; vsnprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27688,8 +27688,8 @@ void test__vsnprintf__arg3__notuninit() {
 }
 
 void test__std__vsnprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vsnprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; std::vsnprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27724,8 +27724,8 @@ void test__std__vsnprintf__arg3__notuninit() {
 }
 
 void test__wscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wscanf(arg1);
+  int x = 1;
+  if (cond) { x=100; wscanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27748,8 +27748,8 @@ void test__wscanf__arg1__notuninit() {
 }
 
 void test__std__wscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wscanf(arg1);
+  int x = 1;
+  if (cond) { x=100; std::wscanf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27772,8 +27772,8 @@ void test__std__wscanf__arg1__notuninit() {
 }
 
 void test__sscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27802,8 +27802,8 @@ void test__sscanf__arg2__notuninit() {
 }
 
 void test__std__sscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::sscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::sscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27832,8 +27832,8 @@ void test__std__sscanf__arg2__notuninit() {
 }
 
 void test__fwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fwscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27857,8 +27857,8 @@ void test__fwscanf__arg2__notuninit() {
 }
 
 void test__std__fwscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fwscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::fwscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27882,8 +27882,8 @@ void test__std__fwscanf__arg2__notuninit() {
 }
 
 void test__swscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else swscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; swscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27907,8 +27907,8 @@ void test__swscanf__arg2__notuninit() {
 }
 
 void test__std__swscanf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::swscanf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::swscanf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27932,8 +27932,8 @@ void test__std__swscanf__arg2__notuninit() {
 }
 
 void test__system__noreturn() {
-  int x = 100;
-  if (cond) x=1; else system(arg1);
+  int x = 1;
+  if (cond) { x=100; system(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27951,8 +27951,8 @@ void test__system__arg1__notuninit() {
 }
 
 void test__std__system__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::system(arg1);
+  int x = 1;
+  if (cond) { x=100; std::system(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27970,8 +27970,8 @@ void test__std__system__arg1__notuninit() {
 }
 
 void test__setw__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setw(arg1);
+  int x = 1;
+  if (cond) { x=100; setw(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -27989,8 +27989,8 @@ void test__setw__arg1__notuninit() {
 }
 
 void test__std__setw__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setw(arg1);
+  int x = 1;
+  if (cond) { x=100; std::setw(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28008,8 +28008,8 @@ void test__std__setw__arg1__notuninit() {
 }
 
 void test__min__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = min(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = min(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28038,8 +28038,8 @@ void test__min__arg2__notuninit() {
 }
 
 void test__std__min__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::min(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::min(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28068,8 +28068,8 @@ void test__std__min__arg2__notuninit() {
 }
 
 void test__max__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = max(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = max(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28098,8 +28098,8 @@ void test__max__arg2__notuninit() {
 }
 
 void test__std__max__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::max(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::max(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28128,8 +28128,8 @@ void test__std__max__arg2__notuninit() {
 }
 
 void test__setiosflags__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setiosflags(arg1);
+  int x = 1;
+  if (cond) { x=100; setiosflags(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28147,8 +28147,8 @@ void test__setiosflags__arg1__notuninit() {
 }
 
 void test__std__setiosflags__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setiosflags(arg1);
+  int x = 1;
+  if (cond) { x=100; std::setiosflags(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28166,8 +28166,8 @@ void test__std__setiosflags__arg1__notuninit() {
 }
 
 void test__resetiosflags__noreturn() {
-  int x = 100;
-  if (cond) x=1; else resetiosflags(arg1);
+  int x = 1;
+  if (cond) { x=100; resetiosflags(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28185,8 +28185,8 @@ void test__resetiosflags__arg1__notuninit() {
 }
 
 void test__std__resetiosflags__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::resetiosflags(arg1);
+  int x = 1;
+  if (cond) { x=100; std::resetiosflags(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28204,8 +28204,8 @@ void test__std__resetiosflags__arg1__notuninit() {
 }
 
 void test__setfill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setfill(arg1);
+  int x = 1;
+  if (cond) { x=100; setfill(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28223,8 +28223,8 @@ void test__setfill__arg1__notuninit() {
 }
 
 void test__std__setfill__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setfill(arg1);
+  int x = 1;
+  if (cond) { x=100; std::setfill(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28242,8 +28242,8 @@ void test__std__setfill__arg1__notuninit() {
 }
 
 void test__setprecision__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setprecision(arg1);
+  int x = 1;
+  if (cond) { x=100; setprecision(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28261,8 +28261,8 @@ void test__setprecision__arg1__notuninit() {
 }
 
 void test__std__setprecision__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setprecision(arg1);
+  int x = 1;
+  if (cond) { x=100; std::setprecision(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28280,8 +28280,8 @@ void test__std__setprecision__arg1__notuninit() {
 }
 
 void test__setbase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setbase(arg1);
+  int x = 1;
+  if (cond) { x=100; setbase(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28299,8 +28299,8 @@ void test__setbase__arg1__notuninit() {
 }
 
 void test__std__setbase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::setbase(arg1);
+  int x = 1;
+  if (cond) { x=100; std::setbase(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28318,8 +28318,8 @@ void test__std__setbase__arg1__notuninit() {
 }
 
 void test__zonetime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = zonetime(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = zonetime(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28353,8 +28353,8 @@ void test__zonetime__arg2__notuninit() {
 }
 
 void test__c16rtomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else c16rtomb(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; c16rtomb(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28383,8 +28383,8 @@ void test__c16rtomb__arg3__notuninit() {
 }
 
 void test__c32rtomb__noreturn() {
-  int x = 100;
-  if (cond) x=1; else c32rtomb(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; c32rtomb(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28413,8 +28413,8 @@ void test__c32rtomb__arg3__notuninit() {
 }
 
 void test__mbrtoc16__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbrtoc16(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mbrtoc16(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28449,8 +28449,8 @@ void test__mbrtoc16__arg4__notuninit() {
 }
 
 void test__mbrtoc32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else mbrtoc32(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; mbrtoc32(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28485,8 +28485,8 @@ void test__mbrtoc32__arg4__notuninit() {
 }
 
 void test__std__swap__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::swap(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::swap(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28504,8 +28504,8 @@ void test__std__swap__arg2__notuninit() {
 }
 
 void test__std__ostringstream__str__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostringstream::str();
+  int x = 1;
+  if (cond) { x=100; result = std::ostringstream::str(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28516,8 +28516,8 @@ void test__std__ostringstream__str__useretval() {
 }
 
 void test__std__ios__good__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios::good();
+  int x = 1;
+  if (cond) { x=100; result = std::ios::good(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28528,8 +28528,8 @@ void test__std__ios__good__useretval() {
 }
 
 void test__std__ios_base__good__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios_base::good();
+  int x = 1;
+  if (cond) { x=100; result = std::ios_base::good(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28540,8 +28540,8 @@ void test__std__ios_base__good__useretval() {
 }
 
 void test__std__ostream__good__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostream::good();
+  int x = 1;
+  if (cond) { x=100; result = std::ostream::good(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28552,8 +28552,8 @@ void test__std__ostream__good__useretval() {
 }
 
 void test__std__ofstream__good__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ofstream::good();
+  int x = 1;
+  if (cond) { x=100; result = std::ofstream::good(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28564,8 +28564,8 @@ void test__std__ofstream__good__useretval() {
 }
 
 void test__std__ostringstream__good__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostringstream::good();
+  int x = 1;
+  if (cond) { x=100; result = std::ostringstream::good(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28576,8 +28576,8 @@ void test__std__ostringstream__good__useretval() {
 }
 
 void test__std__ios__eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios::eof();
+  int x = 1;
+  if (cond) { x=100; result = std::ios::eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28588,8 +28588,8 @@ void test__std__ios__eof__useretval() {
 }
 
 void test__std__ios_base__eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios_base::eof();
+  int x = 1;
+  if (cond) { x=100; result = std::ios_base::eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28600,8 +28600,8 @@ void test__std__ios_base__eof__useretval() {
 }
 
 void test__std__ostream__eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostream::eof();
+  int x = 1;
+  if (cond) { x=100; result = std::ostream::eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28612,8 +28612,8 @@ void test__std__ostream__eof__useretval() {
 }
 
 void test__std__ofstream__eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ofstream::eof();
+  int x = 1;
+  if (cond) { x=100; result = std::ofstream::eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28624,8 +28624,8 @@ void test__std__ofstream__eof__useretval() {
 }
 
 void test__std__ostringstream__eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostringstream::eof();
+  int x = 1;
+  if (cond) { x=100; result = std::ostringstream::eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28636,8 +28636,8 @@ void test__std__ostringstream__eof__useretval() {
 }
 
 void test__std__ios__fail__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios::fail();
+  int x = 1;
+  if (cond) { x=100; result = std::ios::fail(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28648,8 +28648,8 @@ void test__std__ios__fail__useretval() {
 }
 
 void test__std__ios_base__fail__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios_base::fail();
+  int x = 1;
+  if (cond) { x=100; result = std::ios_base::fail(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28660,8 +28660,8 @@ void test__std__ios_base__fail__useretval() {
 }
 
 void test__std__ostream__fail__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostream::fail();
+  int x = 1;
+  if (cond) { x=100; result = std::ostream::fail(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28672,8 +28672,8 @@ void test__std__ostream__fail__useretval() {
 }
 
 void test__std__ofstream__fail__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ofstream::fail();
+  int x = 1;
+  if (cond) { x=100; result = std::ofstream::fail(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28684,8 +28684,8 @@ void test__std__ofstream__fail__useretval() {
 }
 
 void test__std__ostringstream__fail__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostringstream::fail();
+  int x = 1;
+  if (cond) { x=100; result = std::ostringstream::fail(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28696,8 +28696,8 @@ void test__std__ostringstream__fail__useretval() {
 }
 
 void test__std__ios__bad__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios::bad();
+  int x = 1;
+  if (cond) { x=100; result = std::ios::bad(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28708,8 +28708,8 @@ void test__std__ios__bad__useretval() {
 }
 
 void test__std__ios_base__bad__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ios_base::bad();
+  int x = 1;
+  if (cond) { x=100; result = std::ios_base::bad(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28720,8 +28720,8 @@ void test__std__ios_base__bad__useretval() {
 }
 
 void test__std__ostream__bad__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostream::bad();
+  int x = 1;
+  if (cond) { x=100; result = std::ostream::bad(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28732,8 +28732,8 @@ void test__std__ostream__bad__useretval() {
 }
 
 void test__std__ofstream__bad__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ofstream::bad();
+  int x = 1;
+  if (cond) { x=100; result = std::ofstream::bad(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28744,8 +28744,8 @@ void test__std__ofstream__bad__useretval() {
 }
 
 void test__std__ostringstream__bad__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::ostringstream::bad();
+  int x = 1;
+  if (cond) { x=100; result = std::ostringstream::bad(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28756,106 +28756,106 @@ void test__std__ostringstream__bad__useretval() {
 }
 
 void test__std__array__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::array::clear();
+  int x = 1;
+  if (cond) { x=100; std::array::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__deque__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::deque::clear();
+  int x = 1;
+  if (cond) { x=100; std::deque::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__list__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::clear();
+  int x = 1;
+  if (cond) { x=100; std::list::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__forward_list__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::forward_list::clear();
+  int x = 1;
+  if (cond) { x=100; std::forward_list::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__map__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::map::clear();
+  int x = 1;
+  if (cond) { x=100; std::map::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__unordered_map__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::unordered_map::clear();
+  int x = 1;
+  if (cond) { x=100; std::unordered_map::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__queue__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::queue::clear();
+  int x = 1;
+  if (cond) { x=100; std::queue::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__set__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::set::clear();
+  int x = 1;
+  if (cond) { x=100; std::set::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__unordered_set__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::unordered_set::clear();
+  int x = 1;
+  if (cond) { x=100; std::unordered_set::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__stack__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::stack::clear();
+  int x = 1;
+  if (cond) { x=100; std::stack::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__string__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::clear();
+  int x = 1;
+  if (cond) { x=100; std::string::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__wstring__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wstring::clear();
+  int x = 1;
+  if (cond) { x=100; std::wstring::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__basic_string__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::basic_string::clear();
+  int x = 1;
+  if (cond) { x=100; std::basic_string::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__vector__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::clear();
+  int x = 1;
+  if (cond) { x=100; std::vector::clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__array__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::array::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::array::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28866,8 +28866,8 @@ void test__std__array__empty__useretval() {
 }
 
 void test__std__deque__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::deque::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::deque::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28878,8 +28878,8 @@ void test__std__deque__empty__useretval() {
 }
 
 void test__std__list__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::list::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28890,8 +28890,8 @@ void test__std__list__empty__useretval() {
 }
 
 void test__std__forward_list__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::forward_list::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::forward_list::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28902,8 +28902,8 @@ void test__std__forward_list__empty__useretval() {
 }
 
 void test__std__map__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::map::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::map::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28914,8 +28914,8 @@ void test__std__map__empty__useretval() {
 }
 
 void test__std__unordered_map__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_map::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_map::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28926,8 +28926,8 @@ void test__std__unordered_map__empty__useretval() {
 }
 
 void test__std__queue__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::queue::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::queue::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28938,8 +28938,8 @@ void test__std__queue__empty__useretval() {
 }
 
 void test__std__set__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::set::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::set::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28950,8 +28950,8 @@ void test__std__set__empty__useretval() {
 }
 
 void test__std__unordered_set__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_set::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_set::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28962,8 +28962,8 @@ void test__std__unordered_set__empty__useretval() {
 }
 
 void test__std__stack__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stack::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::stack::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28974,8 +28974,8 @@ void test__std__stack__empty__useretval() {
 }
 
 void test__std__string__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::string::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28986,8 +28986,8 @@ void test__std__string__empty__useretval() {
 }
 
 void test__std__wstring__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -28998,8 +28998,8 @@ void test__std__wstring__empty__useretval() {
 }
 
 void test__std__basic_string__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29010,8 +29010,8 @@ void test__std__basic_string__empty__useretval() {
 }
 
 void test__std__vector__empty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::empty();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::empty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29022,8 +29022,8 @@ void test__std__vector__empty__useretval() {
 }
 
 void test__std__deque__push_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::deque::push_back(arg1);
+  int x = 1;
+  if (cond) { x=100; std::deque::push_back(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29035,8 +29035,8 @@ void test__std__deque__push_back__arg1__notuninit() {
 }
 
 void test__std__deque__push_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::deque::push_front(arg1);
+  int x = 1;
+  if (cond) { x=100; std::deque::push_front(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29048,8 +29048,8 @@ void test__std__deque__push_front__arg1__notuninit() {
 }
 
 void test__std__list__push_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::push_back(arg1);
+  int x = 1;
+  if (cond) { x=100; std::list::push_back(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29061,8 +29061,8 @@ void test__std__list__push_back__arg1__notuninit() {
 }
 
 void test__std__list__push_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::push_front(arg1);
+  int x = 1;
+  if (cond) { x=100; std::list::push_front(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29074,8 +29074,8 @@ void test__std__list__push_front__arg1__notuninit() {
 }
 
 void test__std__forward_list__push_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::forward_list::push_front(arg1);
+  int x = 1;
+  if (cond) { x=100; std::forward_list::push_front(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29087,8 +29087,8 @@ void test__std__forward_list__push_front__arg1__notuninit() {
 }
 
 void test__std__queue__push__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::queue::push(arg1);
+  int x = 1;
+  if (cond) { x=100; std::queue::push(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29100,8 +29100,8 @@ void test__std__queue__push__arg1__notuninit() {
 }
 
 void test__std__stack__push__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::stack::push(arg1);
+  int x = 1;
+  if (cond) { x=100; std::stack::push(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29113,8 +29113,8 @@ void test__std__stack__push__arg1__notuninit() {
 }
 
 void test__std__vector__push_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::push_back(arg1);
+  int x = 1;
+  if (cond) { x=100; std::vector::push_back(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29126,8 +29126,8 @@ void test__std__vector__push_back__arg1__notuninit() {
 }
 
 void test__std__vector__push_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::push_front(arg1);
+  int x = 1;
+  if (cond) { x=100; std::vector::push_front(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29139,8 +29139,8 @@ void test__std__vector__push_front__arg1__notuninit() {
 }
 
 void test__std__list__insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::insert(arg1);
+  int x = 1;
+  if (cond) { x=100; std::list::insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29152,8 +29152,8 @@ void test__std__list__insert__arg1__notuninit() {
 }
 
 void test__std__multimap__insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::multimap::insert(arg1);
+  int x = 1;
+  if (cond) { x=100; std::multimap::insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29165,8 +29165,8 @@ void test__std__multimap__insert__arg1__notuninit() {
 }
 
 void test__std__set__insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::set::insert(arg1);
+  int x = 1;
+  if (cond) { x=100; std::set::insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29178,8 +29178,8 @@ void test__std__set__insert__arg1__notuninit() {
 }
 
 void test__std__string__insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::insert(arg1);
+  int x = 1;
+  if (cond) { x=100; std::string::insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29191,8 +29191,8 @@ void test__std__string__insert__arg1__notuninit() {
 }
 
 void test__std__vector__insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::insert(arg1);
+  int x = 1;
+  if (cond) { x=100; std::vector::insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29204,71 +29204,71 @@ void test__std__vector__insert__arg1__notuninit() {
 }
 
 void test__std__deque__emplace_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::deque::emplace_back();
+  int x = 1;
+  if (cond) { x=100; std::deque::emplace_back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__deque__emplace_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::deque::emplace_front();
+  int x = 1;
+  if (cond) { x=100; std::deque::emplace_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__list__emplace_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::emplace_back();
+  int x = 1;
+  if (cond) { x=100; std::list::emplace_back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__list__emplace_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::emplace_front();
+  int x = 1;
+  if (cond) { x=100; std::list::emplace_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__forward_list__emplace_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::forward_list::emplace_front();
+  int x = 1;
+  if (cond) { x=100; std::forward_list::emplace_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__queue__emplace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::queue::emplace();
+  int x = 1;
+  if (cond) { x=100; std::queue::emplace(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__stack__emplace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::stack::emplace();
+  int x = 1;
+  if (cond) { x=100; std::stack::emplace(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__vector__emplace_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::emplace_back();
+  int x = 1;
+  if (cond) { x=100; std::vector::emplace_back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__vector__emplace_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::emplace_front();
+  int x = 1;
+  if (cond) { x=100; std::vector::emplace_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__list__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::find(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::list::find(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29285,8 +29285,8 @@ void test__std__list__find__arg1__notuninit() {
 }
 
 void test__std__map__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::map::find(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::map::find(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29303,8 +29303,8 @@ void test__std__map__find__arg1__notuninit() {
 }
 
 void test__std__set__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::set::find(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::set::find(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29321,8 +29321,8 @@ void test__std__set__find__arg1__notuninit() {
 }
 
 void test__std__vector__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::find(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::vector::find(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29339,8 +29339,8 @@ void test__std__vector__find__arg1__notuninit() {
 }
 
 void test__std__deque__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::deque::size();
+  int x = 1;
+  if (cond) { x=100; result = std::deque::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29351,8 +29351,8 @@ void test__std__deque__size__useretval() {
 }
 
 void test__std__deque__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::deque::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::deque::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29363,8 +29363,8 @@ void test__std__deque__max_size__useretval() {
 }
 
 void test__std__list__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::size();
+  int x = 1;
+  if (cond) { x=100; result = std::list::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29375,8 +29375,8 @@ void test__std__list__size__useretval() {
 }
 
 void test__std__list__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::list::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29387,8 +29387,8 @@ void test__std__list__max_size__useretval() {
 }
 
 void test__std__map__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::map::size();
+  int x = 1;
+  if (cond) { x=100; result = std::map::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29399,8 +29399,8 @@ void test__std__map__size__useretval() {
 }
 
 void test__std__map__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::map::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::map::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29411,8 +29411,8 @@ void test__std__map__max_size__useretval() {
 }
 
 void test__std__unordered_map__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_map::size();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_map::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29423,8 +29423,8 @@ void test__std__unordered_map__size__useretval() {
 }
 
 void test__std__unordered_map__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_map::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_map::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29435,8 +29435,8 @@ void test__std__unordered_map__max_size__useretval() {
 }
 
 void test__std__queue__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::queue::size();
+  int x = 1;
+  if (cond) { x=100; result = std::queue::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29447,8 +29447,8 @@ void test__std__queue__size__useretval() {
 }
 
 void test__std__set__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::set::size();
+  int x = 1;
+  if (cond) { x=100; result = std::set::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29459,8 +29459,8 @@ void test__std__set__size__useretval() {
 }
 
 void test__std__set__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::set::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::set::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29471,8 +29471,8 @@ void test__std__set__max_size__useretval() {
 }
 
 void test__std__unordered_set__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_set::size();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_set::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29483,8 +29483,8 @@ void test__std__unordered_set__size__useretval() {
 }
 
 void test__std__unordered_set__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::unordered_set::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::unordered_set::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29495,8 +29495,8 @@ void test__std__unordered_set__max_size__useretval() {
 }
 
 void test__std__stack__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stack::size();
+  int x = 1;
+  if (cond) { x=100; result = std::stack::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29507,8 +29507,8 @@ void test__std__stack__size__useretval() {
 }
 
 void test__std__string__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::size();
+  int x = 1;
+  if (cond) { x=100; result = std::string::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29519,8 +29519,8 @@ void test__std__string__size__useretval() {
 }
 
 void test__std__wstring__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::size();
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29531,8 +29531,8 @@ void test__std__wstring__size__useretval() {
 }
 
 void test__std__vector__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::size();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29543,8 +29543,8 @@ void test__std__vector__size__useretval() {
 }
 
 void test__std__vector__capacity__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::capacity();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::capacity(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29555,8 +29555,8 @@ void test__std__vector__capacity__useretval() {
 }
 
 void test__std__vector__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29567,8 +29567,8 @@ void test__std__vector__max_size__useretval() {
 }
 
 void test__std__array__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::array::size();
+  int x = 1;
+  if (cond) { x=100; result = std::array::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29579,8 +29579,8 @@ void test__std__array__size__useretval() {
 }
 
 void test__std__array__max_size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::array::max_size();
+  int x = 1;
+  if (cond) { x=100; result = std::array::max_size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29591,8 +29591,8 @@ void test__std__array__max_size__useretval() {
 }
 
 void test__std__list__back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::back();
+  int x = 1;
+  if (cond) { x=100; result = std::list::back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29603,8 +29603,8 @@ void test__std__list__back__useretval() {
 }
 
 void test__std__list__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::list::front();
+  int x = 1;
+  if (cond) { x=100; result = std::list::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29615,8 +29615,8 @@ void test__std__list__front__useretval() {
 }
 
 void test__std__forward_list__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::forward_list::front();
+  int x = 1;
+  if (cond) { x=100; result = std::forward_list::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29627,8 +29627,8 @@ void test__std__forward_list__front__useretval() {
 }
 
 void test__std__queue__back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::queue::back();
+  int x = 1;
+  if (cond) { x=100; result = std::queue::back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29639,8 +29639,8 @@ void test__std__queue__back__useretval() {
 }
 
 void test__std__queue__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::queue::front();
+  int x = 1;
+  if (cond) { x=100; result = std::queue::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29651,8 +29651,8 @@ void test__std__queue__front__useretval() {
 }
 
 void test__std__vector__back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::back();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29663,8 +29663,8 @@ void test__std__vector__back__useretval() {
 }
 
 void test__std__vector__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::front();
+  int x = 1;
+  if (cond) { x=100; result = std::vector::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29675,8 +29675,8 @@ void test__std__vector__front__useretval() {
 }
 
 void test__std__array__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::array::front();
+  int x = 1;
+  if (cond) { x=100; result = std::array::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29687,8 +29687,8 @@ void test__std__array__front__useretval() {
 }
 
 void test__std__array__back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::array::back();
+  int x = 1;
+  if (cond) { x=100; result = std::array::back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29699,8 +29699,8 @@ void test__std__array__back__useretval() {
 }
 
 void test__std__vector__at__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::vector::at(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::vector::at(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29717,50 +29717,50 @@ void test__std__vector__at__arg1__notuninit() {
 }
 
 void test__std__list__pop_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::pop_back();
+  int x = 1;
+  if (cond) { x=100; std::list::pop_back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__list__pop_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::list::pop_front();
+  int x = 1;
+  if (cond) { x=100; std::list::pop_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__forward_list__pop_front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::forward_list::pop_front();
+  int x = 1;
+  if (cond) { x=100; std::forward_list::pop_front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__vector__pop_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::vector::pop_back();
+  int x = 1;
+  if (cond) { x=100; std::vector::pop_back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__stack__pop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::stack::pop();
+  int x = 1;
+  if (cond) { x=100; std::stack::pop(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__queue__pop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::queue::pop();
+  int x = 1;
+  if (cond) { x=100; std::queue::pop(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__stack__top__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::stack::top();
+  int x = 1;
+  if (cond) { x=100; result = std::stack::top(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29771,8 +29771,8 @@ void test__std__stack__top__useretval() {
 }
 
 void test__std__string__at__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::at(arg1);
+  int x = 1;
+  if (cond) { x=100; result = std::string::at(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29789,8 +29789,8 @@ void test__std__string__at__arg1__notuninit() {
 }
 
 void test__std__string__push_back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::push_back(arg1);
+  int x = 1;
+  if (cond) { x=100; std::string::push_back(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29802,8 +29802,8 @@ void test__std__string__push_back__arg1__notuninit() {
 }
 
 void test__std__string__back__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::back();
+  int x = 1;
+  if (cond) { x=100; result = std::string::back(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29814,15 +29814,15 @@ void test__std__string__back__useretval() {
 }
 
 void test__std__string__swap__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::swap(arg1);
+  int x = 1;
+  if (cond) { x=100; std::string::swap(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__std__string__c_str__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::c_str();
+  int x = 1;
+  if (cond) { x=100; result = std::string::c_str(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29833,8 +29833,8 @@ void test__std__string__c_str__useretval() {
 }
 
 void test__std__string__data__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::data();
+  int x = 1;
+  if (cond) { x=100; result = std::string::data(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29845,8 +29845,8 @@ void test__std__string__data__useretval() {
 }
 
 void test__std__string__front__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::front();
+  int x = 1;
+  if (cond) { x=100; result = std::string::front(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29857,8 +29857,8 @@ void test__std__string__front__useretval() {
 }
 
 void test__std__basic_string__find_last_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::find_last_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::find_last_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29898,8 +29898,8 @@ void test__std__basic_string__find_last_not_of__arg3__notuninit() {
 }
 
 void test__std__string__find_last_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::find_last_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::find_last_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29939,8 +29939,8 @@ void test__std__string__find_last_not_of__arg3__notuninit() {
 }
 
 void test__std__wstring__find_last_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::find_last_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::find_last_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -29980,8 +29980,8 @@ void test__std__wstring__find_last_not_of__arg3__notuninit() {
 }
 
 void test__std__basic_string__find_first_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::find_first_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::find_first_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30021,8 +30021,8 @@ void test__std__basic_string__find_first_not_of__arg3__notuninit() {
 }
 
 void test__std__string__find_first_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::find_first_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::find_first_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30062,8 +30062,8 @@ void test__std__string__find_first_not_of__arg3__notuninit() {
 }
 
 void test__std__wstring__find_first_not_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::find_first_not_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::find_first_not_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30103,8 +30103,8 @@ void test__std__wstring__find_first_not_of__arg3__notuninit() {
 }
 
 void test__std__string__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::find(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::find(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30144,8 +30144,8 @@ void test__std__string__find__arg3__notuninit() {
 }
 
 void test__std__string__rfind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::rfind(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::rfind(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30185,8 +30185,8 @@ void test__std__string__rfind__arg3__notuninit() {
 }
 
 void test__std__wstring__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::find(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::find(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30226,8 +30226,8 @@ void test__std__wstring__find__arg3__notuninit() {
 }
 
 void test__std__wstring__rfind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::rfind(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::rfind(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30267,8 +30267,8 @@ void test__std__wstring__rfind__arg3__notuninit() {
 }
 
 void test__std__basic_string__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::find(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::find(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30308,8 +30308,8 @@ void test__std__basic_string__find__arg3__notuninit() {
 }
 
 void test__std__basic_string__rfind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::rfind(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::rfind(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30349,8 +30349,8 @@ void test__std__basic_string__rfind__arg3__notuninit() {
 }
 
 void test__std__string__find_first_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::find_first_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::find_first_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30390,8 +30390,8 @@ void test__std__string__find_first_of__arg3__notuninit() {
 }
 
 void test__std__wstring__find_first_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::find_first_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::find_first_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30431,8 +30431,8 @@ void test__std__wstring__find_first_of__arg3__notuninit() {
 }
 
 void test__std__basic_string__find_first_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::find_first_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::find_first_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30472,8 +30472,8 @@ void test__std__basic_string__find_first_of__arg3__notuninit() {
 }
 
 void test__std__string__find_last_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::find_last_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::string::find_last_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30513,8 +30513,8 @@ void test__std__string__find_last_of__arg3__notuninit() {
 }
 
 void test__std__wstring__find_last_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::find_last_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::find_last_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30554,8 +30554,8 @@ void test__std__wstring__find_last_of__arg3__notuninit() {
 }
 
 void test__std__basic_string__find_last_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::find_last_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::find_last_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30595,8 +30595,8 @@ void test__std__basic_string__find_last_of__arg3__notuninit() {
 }
 
 void test__std__string__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::length();
+  int x = 1;
+  if (cond) { x=100; result = std::string::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30607,8 +30607,8 @@ void test__std__string__length__useretval() {
 }
 
 void test__std__wstring__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::length();
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30619,8 +30619,8 @@ void test__std__wstring__length__useretval() {
 }
 
 void test__std__basic_string__size__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::size();
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::size(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30631,8 +30631,8 @@ void test__std__basic_string__size__useretval() {
 }
 
 void test__std__basic_string__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::length();
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30643,8 +30643,8 @@ void test__std__basic_string__length__useretval() {
 }
 
 void test__std__string__substr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::string::substr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::string::substr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30667,8 +30667,8 @@ void test__std__string__substr__arg2__notuninit() {
 }
 
 void test__std__wstring__substr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::wstring::substr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::wstring::substr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30691,8 +30691,8 @@ void test__std__wstring__substr__arg2__notuninit() {
 }
 
 void test__std__basic_string__substr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::basic_string::substr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = std::basic_string::substr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30715,8 +30715,8 @@ void test__std__basic_string__substr__arg2__notuninit() {
 }
 
 void test__std__ios__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ios::clear(arg1);
+  int x = 1;
+  if (cond) { x=100; std::ios::clear(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30734,8 +30734,8 @@ void test__std__ios__clear__arg1__notuninit() {
 }
 
 void test__std__fstream__clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::fstream::clear(arg1);
+  int x = 1;
+  if (cond) { x=100; std::fstream::clear(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30753,8 +30753,8 @@ void test__std__fstream__clear__arg1__notuninit() {
 }
 
 void test__std__istream__read__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::istream::read(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::istream::read(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30777,8 +30777,8 @@ void test__std__istream__read__arg2__notuninit() {
 }
 
 void test__std__ifstream__read__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ifstream::read(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::ifstream::read(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30801,8 +30801,8 @@ void test__std__ifstream__read__arg2__notuninit() {
 }
 
 void test__std__istream__readsome__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::istream::readsome(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::istream::readsome(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30825,8 +30825,8 @@ void test__std__istream__readsome__arg2__notuninit() {
 }
 
 void test__std__ifstream__readsome__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ifstream::readsome(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::ifstream::readsome(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30849,8 +30849,8 @@ void test__std__ifstream__readsome__arg2__notuninit() {
 }
 
 void test__std__istream__getline__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::istream::getline(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::istream::getline(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30879,8 +30879,8 @@ void test__std__istream__getline__arg3__notuninit() {
 }
 
 void test__std__ifstream__getline__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ifstream::getline(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::ifstream::getline(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30909,8 +30909,8 @@ void test__std__ifstream__getline__arg3__notuninit() {
 }
 
 void test__std__istream__get__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::istream::get(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::istream::get(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30939,8 +30939,8 @@ void test__std__istream__get__arg3__notuninit() {
 }
 
 void test__std__ifstream__get__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::ifstream::get(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::ifstream::get(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30969,8 +30969,8 @@ void test__std__ifstream__get__arg3__notuninit() {
 }
 
 void test__itoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else itoa(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; itoa(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -30999,8 +30999,8 @@ void test__itoa__arg3__notuninit() {
 }
 
 void test__std__string__erase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::erase(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::string::erase(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31024,8 +31024,8 @@ void test__std__string__erase__arg2__notuninit() {
 }
 
 void test__std__wstring__erase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wstring::erase(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::wstring::erase(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31049,8 +31049,8 @@ void test__std__wstring__erase__arg2__notuninit() {
 }
 
 void test__std__basic_string__erase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::basic_string::erase(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; std::basic_string::erase(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31074,8 +31074,8 @@ void test__std__basic_string__erase__arg2__notuninit() {
 }
 
 void test__std__string__reserve__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::string::reserve(arg1);
+  int x = 1;
+  if (cond) { x=100; std::string::reserve(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31093,8 +31093,8 @@ void test__std__string__reserve__arg1__notuninit() {
 }
 
 void test__std__wstring__reserve__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::wstring::reserve(arg1);
+  int x = 1;
+  if (cond) { x=100; std::wstring::reserve(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31112,8 +31112,8 @@ void test__std__wstring__reserve__arg1__notuninit() {
 }
 
 void test__std__basic_string__reserve__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::basic_string::reserve(arg1);
+  int x = 1;
+  if (cond) { x=100; std::basic_string::reserve(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31131,8 +31131,8 @@ void test__std__basic_string__reserve__arg1__notuninit() {
 }
 
 void test__std__adjacent_find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::adjacent_find(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::adjacent_find(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31161,8 +31161,8 @@ void test__std__adjacent_find__arg3__notuninit() {
 }
 
 void test__std__find__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::find(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::find(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31191,8 +31191,8 @@ void test__std__find__arg3__notuninit() {
 }
 
 void test__std__find_if__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::find_if(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::find_if(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31221,8 +31221,8 @@ void test__std__find_if__arg3__notuninit() {
 }
 
 void test__std__find_if_not__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::find_if_not(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::find_if_not(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31251,8 +31251,8 @@ void test__std__find_if_not__arg3__notuninit() {
 }
 
 void test__std__copy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::copy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::copy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31276,8 +31276,8 @@ void test__std__copy__arg3__notuninit() {
 }
 
 void test__std__all_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::all_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::all_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31306,8 +31306,8 @@ void test__std__all_of__arg3__notuninit() {
 }
 
 void test__std__any_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::any_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::any_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31336,8 +31336,8 @@ void test__std__any_of__arg3__notuninit() {
 }
 
 void test__std__none_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::none_of(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::none_of(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31366,8 +31366,8 @@ void test__std__none_of__arg3__notuninit() {
 }
 
 void test__std__count__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::count(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::count(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31396,8 +31396,8 @@ void test__std__count__arg3__notuninit() {
 }
 
 void test__std__count_if__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::count_if(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::count_if(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31426,8 +31426,8 @@ void test__std__count_if__arg3__notuninit() {
 }
 
 void test__std__for_each__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::for_each(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::for_each(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31451,8 +31451,8 @@ void test__std__for_each__arg3__notuninit() {
 }
 
 void test__std__search_n__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::search_n(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = std::search_n(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31487,8 +31487,8 @@ void test__std__search_n__arg4__notuninit() {
 }
 
 void test__std__find_end__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::find_end(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = std::find_end(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31534,8 +31534,8 @@ void test__std__find_end__arg5__notuninit() {
 }
 
 void test__std__find_first_of__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::find_first_of(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = std::find_first_of(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31581,8 +31581,8 @@ void test__std__find_first_of__arg5__notuninit() {
 }
 
 void test__std__search__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::search(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; result = std::search(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31628,8 +31628,8 @@ void test__std__search__arg5__notuninit() {
 }
 
 void test__std__inplace_merge__noreturn() {
-  int x = 100;
-  if (cond) x=1; else std::inplace_merge(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; std::inplace_merge(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31653,8 +31653,8 @@ void test__std__inplace_merge__arg3__notuninit() {
 }
 
 void test__std__equal__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::equal(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::equal(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31683,8 +31683,8 @@ void test__std__equal__arg3__notuninit() {
 }
 
 void test__std__is_permutation__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::is_permutation(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::is_permutation(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31713,8 +31713,8 @@ void test__std__is_permutation__arg3__notuninit() {
 }
 
 void test__std__mismatch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = std::mismatch(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = std::mismatch(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -31743,8 +31743,8 @@ void test__std__mismatch__arg3__notuninit() {
 }
 
 void test__offsetof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = offsetof(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = offsetof(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-windows.cpp b/test/cfg/generated-cfg-tests-windows.cpp
index 717562fe8..b9ec13cbc 100644
--- a/test/cfg/generated-cfg-tests-windows.cpp
+++ b/test/cfg/generated-cfg-tests-windows.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/windows.cfg > generated-cfg-tests-windows.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-windows.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-windows.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__RtlCompareMemory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = RtlCompareMemory(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = RtlCompareMemory(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -54,8 +54,8 @@ void test__RtlCompareMemory__arg3__notbool() {
 }
 
 void test__RtlCopyBytes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RtlCopyBytes(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; RtlCopyBytes(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -88,8 +88,8 @@ void test__RtlCopyBytes__arg3__notbool() {
 }
 
 void test__RtlFillBytes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RtlFillBytes(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; RtlFillBytes(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -117,8 +117,8 @@ void test__RtlFillBytes__arg3__notuninit() {
 }
 
 void test__RtlSecureZeroMemory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RtlSecureZeroMemory(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; RtlSecureZeroMemory(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -140,8 +140,8 @@ void test__RtlSecureZeroMemory__arg2__notbool() {
 }
 
 void test__RtlZeroBytes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RtlZeroBytes(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; RtlZeroBytes(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -163,22 +163,22 @@ void test__RtlZeroBytes__arg2__notbool() {
 }
 
 void test__KeBugCheck__noreturn() {
-  int x = 100;
-  if (cond) x=1; else KeBugCheck();
+  int x = 1;
+  if (cond) { x=100; KeBugCheck(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__KeBugCheckEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else KeBugCheckEx();
+  int x = 1;
+  if (cond) { x=100; KeBugCheckEx(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__CString__Format__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CString::Format(arg1);
+  int x = 1;
+  if (cond) { x=100; CString::Format(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -196,8 +196,8 @@ void test__CString__Format__arg1__notuninit() {
 }
 
 void test__CString__AppendFormat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CString::AppendFormat(arg1);
+  int x = 1;
+  if (cond) { x=100; CString::AppendFormat(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -215,8 +215,8 @@ void test__CString__AppendFormat__arg1__notuninit() {
 }
 
 void test__printf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else printf_s(arg1);
+  int x = 1;
+  if (cond) { x=100; printf_s(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -239,8 +239,8 @@ void test__printf_s__arg1__notuninit() {
 }
 
 void test__wprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wprintf_s(arg1);
+  int x = 1;
+  if (cond) { x=100; wprintf_s(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -263,8 +263,8 @@ void test__wprintf_s__arg1__notuninit() {
 }
 
 void test__fprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fprintf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fprintf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -287,8 +287,8 @@ void test__fprintf_s__arg2__notuninit() {
 }
 
 void test__fwprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwprintf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fwprintf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -311,8 +311,8 @@ void test__fwprintf_s__arg2__notuninit() {
 }
 
 void test___snprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _snprintf_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _snprintf_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -335,8 +335,8 @@ void test___snprintf_s__arg4__notuninit() {
 }
 
 void test___snwprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _snwprintf_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _snwprintf_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -359,8 +359,8 @@ void test___snwprintf_s__arg4__notuninit() {
 }
 
 void test__DbgPrint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DbgPrint(arg1);
+  int x = 1;
+  if (cond) { x=100; DbgPrint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -383,8 +383,8 @@ void test__DbgPrint__arg1__notuninit() {
 }
 
 void test__DbgPrintEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DbgPrintEx(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; DbgPrintEx(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -407,8 +407,8 @@ void test__DbgPrintEx__arg3__notuninit() {
 }
 
 void test__vDbgPrintEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vDbgPrintEx(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; vDbgPrintEx(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -431,8 +431,8 @@ void test__vDbgPrintEx__arg3__notuninit() {
 }
 
 void test__vDbgPrintExWithPrefix__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vDbgPrintExWithPrefix(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; vDbgPrintExWithPrefix(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -455,8 +455,8 @@ void test__vDbgPrintExWithPrefix__arg4__notuninit() {
 }
 
 void test__scanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else scanf_s(arg1);
+  int x = 1;
+  if (cond) { x=100; scanf_s(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -473,8 +473,8 @@ void test__scanf_s__arg1__notuninit() {
 }
 
 void test__wscanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wscanf_s(arg1);
+  int x = 1;
+  if (cond) { x=100; wscanf_s(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -491,8 +491,8 @@ void test__wscanf_s__arg1__notuninit() {
 }
 
 void test__sscanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sscanf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; sscanf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -509,8 +509,8 @@ void test__sscanf_s__arg2__notuninit() {
 }
 
 void test__fscanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fscanf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fscanf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -527,8 +527,8 @@ void test__fscanf_s__arg2__notuninit() {
 }
 
 void test__fwscanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else fwscanf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; fwscanf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -545,8 +545,8 @@ void test__fwscanf_s__arg2__notuninit() {
 }
 
 void test__swscanf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else swscanf_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; swscanf_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -563,8 +563,8 @@ void test__swscanf_s__arg2__notuninit() {
 }
 
 void test__CloseHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CloseHandle(arg1);
+  int x = 1;
+  if (cond) { x=100; CloseHandle(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -576,8 +576,8 @@ void test__CloseHandle__arg1__notuninit() {
 }
 
 void test__OpenFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenFile(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenFile(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -600,8 +600,8 @@ void test__OpenFile__arg3__notuninit() {
 }
 
 void test__BuildCommDCB__noreturn() {
-  int x = 100;
-  if (cond) x=1; else BuildCommDCB(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; BuildCommDCB(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -613,8 +613,8 @@ void test__BuildCommDCB__arg1__notuninit() {
 }
 
 void test__BuildCommDCBAndTimeouts__noreturn() {
-  int x = 100;
-  if (cond) x=1; else BuildCommDCBAndTimeouts(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; BuildCommDCBAndTimeouts(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -626,8 +626,8 @@ void test__BuildCommDCBAndTimeouts__arg1__notuninit() {
 }
 
 void test__WriteFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WriteFile(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; WriteFile(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -651,8 +651,8 @@ void test__WriteFile__arg3__notuninit() {
 }
 
 void test__ReadFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ReadFile(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; ReadFile(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -675,8 +675,8 @@ void test__ReadFile__arg3__notuninit() {
 }
 
 void test__CreateFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateFile(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+  int x = 1;
+  if (cond) { x=100; CreateFile(arg1, arg2, arg3, arg4, arg5, arg6, arg7); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -724,8 +724,8 @@ void test__CreateFile__arg7__notuninit() {
 }
 
 void test__SetCommTimeouts__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetCommTimeouts(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetCommTimeouts(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -743,8 +743,8 @@ void test__SetCommTimeouts__arg2__notuninit() {
 }
 
 void test__SetCommState__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetCommState(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetCommState(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -762,8 +762,8 @@ void test__SetCommState__arg2__notuninit() {
 }
 
 void test___mbstok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbstok(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _mbstok(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -797,8 +797,8 @@ void test___mbstok__arg2__notuninit() {
 }
 
 void test___tcstok__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcstok(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tcstok(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -832,8 +832,8 @@ void test___tcstok__arg2__notuninit() {
 }
 
 void test___mbstok_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbstok_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbstok_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -873,8 +873,8 @@ void test___mbstok_l__arg3__notuninit() {
 }
 
 void test___strtok_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _strtok_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _strtok_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -919,8 +919,8 @@ void test___strtok_s_l__arg4__notuninit() {
 }
 
 void test___wcstok_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcstok_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _wcstok_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -965,8 +965,8 @@ void test___wcstok_s_l__arg4__notuninit() {
 }
 
 void test___mbstok_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbstok_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _mbstok_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1011,8 +1011,8 @@ void test___mbstok_s_l__arg4__notuninit() {
 }
 
 void test___tcstok_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcstok_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _tcstok_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1057,8 +1057,8 @@ void test___tcstok_s_l__arg4__notuninit() {
 }
 
 void test__strtok_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strtok_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strtok_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1097,8 +1097,8 @@ void test__strtok_s__arg3__notnull() {
 }
 
 void test__wcstok_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcstok_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcstok_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1137,8 +1137,8 @@ void test__wcstok_s__arg3__notnull() {
 }
 
 void test___mbstok_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbstok_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbstok_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1177,8 +1177,8 @@ void test___mbstok_s__arg3__notnull() {
 }
 
 void test___tcstok_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcstok_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _tcstok_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1217,8 +1217,8 @@ void test___tcstok_s__arg3__notnull() {
 }
 
 void test___getcwd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _getcwd(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _getcwd(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1242,8 +1242,8 @@ void test___getcwd__arg2__notuninit() {
 }
 
 void test___wgetcwd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wgetcwd(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wgetcwd(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1267,8 +1267,8 @@ void test___wgetcwd__arg2__notuninit() {
 }
 
 void test__SHGetFolderPath__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SHGetFolderPath(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; SHGetFolderPath(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1309,8 +1309,8 @@ void test__SHGetFolderPath__arg5__notnull() {
 }
 
 void test__SHGetFolderPathA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SHGetFolderPathA(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; SHGetFolderPathA(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1351,8 +1351,8 @@ void test__SHGetFolderPathA__arg5__notnull() {
 }
 
 void test__SHGetFolderPathW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SHGetFolderPathW(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; SHGetFolderPathW(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1393,8 +1393,8 @@ void test__SHGetFolderPathW__arg5__notnull() {
 }
 
 void test__RegQueryValueEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegQueryValueEx(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; RegQueryValueEx(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1424,8 +1424,8 @@ void test__RegQueryValueEx__arg4__notuninit() {
 }
 
 void test__RegQueryValueExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegQueryValueExA(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; RegQueryValueExA(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1455,8 +1455,8 @@ void test__RegQueryValueExA__arg4__notuninit() {
 }
 
 void test__RegQueryValueExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegQueryValueExW(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; RegQueryValueExW(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1486,8 +1486,8 @@ void test__RegQueryValueExW__arg4__notuninit() {
 }
 
 void test__RegCloseKey__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegCloseKey(arg1);
+  int x = 1;
+  if (cond) { x=100; RegCloseKey(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1505,8 +1505,8 @@ void test__RegCloseKey__arg1__notuninit() {
 }
 
 void test___stricmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stricmp_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _stricmp_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1546,8 +1546,8 @@ void test___stricmp_l__arg3__notuninit() {
 }
 
 void test___wcsicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsicmp_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _wcsicmp_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1587,8 +1587,8 @@ void test___wcsicmp_l__arg3__notuninit() {
 }
 
 void test___mbsicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsicmp_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbsicmp_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1628,8 +1628,8 @@ void test___mbsicmp_l__arg3__notuninit() {
 }
 
 void test__stricmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else stricmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; stricmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1663,8 +1663,8 @@ void test__stricmp__arg2__notuninit() {
 }
 
 void test___stricmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stricmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stricmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1698,8 +1698,8 @@ void test___stricmp__arg2__notuninit() {
 }
 
 void test__wcsicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcsicmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wcsicmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1733,8 +1733,8 @@ void test__wcsicmp__arg2__notuninit() {
 }
 
 void test___wcsicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsicmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wcsicmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1768,8 +1768,8 @@ void test___wcsicmp__arg2__notuninit() {
 }
 
 void test___mbsicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsicmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _mbsicmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1803,8 +1803,8 @@ void test___mbsicmp__arg2__notuninit() {
 }
 
 void test___tcsicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsicmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tcsicmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1838,8 +1838,8 @@ void test___tcsicmp__arg2__notuninit() {
 }
 
 void test__GetFileAttributes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetFileAttributes(arg1);
+  int x = 1;
+  if (cond) { x=100; GetFileAttributes(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1857,8 +1857,8 @@ void test__GetFileAttributes__arg1__notuninit() {
 }
 
 void test__GetFileAttributesA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetFileAttributesA(arg1);
+  int x = 1;
+  if (cond) { x=100; GetFileAttributesA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1876,8 +1876,8 @@ void test__GetFileAttributesA__arg1__notuninit() {
 }
 
 void test__GetFileAttributesW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetFileAttributesW(arg1);
+  int x = 1;
+  if (cond) { x=100; GetFileAttributesW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1895,8 +1895,8 @@ void test__GetFileAttributesW__arg1__notuninit() {
 }
 
 void test__RegOpenKeyEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegOpenKeyEx(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; RegOpenKeyEx(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1926,8 +1926,8 @@ void test__RegOpenKeyEx__arg4__notuninit() {
 }
 
 void test__RegOpenKeyExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegOpenKeyExA(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; RegOpenKeyExA(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1957,8 +1957,8 @@ void test__RegOpenKeyExA__arg4__notuninit() {
 }
 
 void test__RegOpenKeyExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegOpenKeyExW(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; RegOpenKeyExW(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1988,8 +1988,8 @@ void test__RegOpenKeyExW__arg4__notuninit() {
 }
 
 void test__wsprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wsprintf(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wsprintf(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2018,8 +2018,8 @@ void test__wsprintf__arg2__notuninit() {
 }
 
 void test__wsprintfA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wsprintfA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wsprintfA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2048,8 +2048,8 @@ void test__wsprintfA__arg2__notuninit() {
 }
 
 void test__wsprintfW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wsprintfW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wsprintfW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2078,8 +2078,8 @@ void test__wsprintfW__arg2__notuninit() {
 }
 
 void test__sprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sprintf_s();
+  int x = 1;
+  if (cond) { x=100; sprintf_s(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2091,8 +2091,8 @@ void test__sprintf_s__leakignore() {
 }
 
 void test__swprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else swprintf_s();
+  int x = 1;
+  if (cond) { x=100; swprintf_s(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2104,8 +2104,8 @@ void test__swprintf_s__leakignore() {
 }
 
 void test___sprintf_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _sprintf_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _sprintf_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2140,8 +2140,8 @@ void test___sprintf_s_l__arg4__notuninit() {
 }
 
 void test___swprintf_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _swprintf_s_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _swprintf_s_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2176,8 +2176,8 @@ void test___swprintf_s_l__arg4__notuninit() {
 }
 
 void test__RegEnumKeyEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegEnumKeyEx(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+  int x = 1;
+  if (cond) { x=100; RegEnumKeyEx(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2201,8 +2201,8 @@ void test__RegEnumKeyEx__arg2__notuninit() {
 }
 
 void test__RegEnumKeyExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegEnumKeyExA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+  int x = 1;
+  if (cond) { x=100; RegEnumKeyExA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2226,8 +2226,8 @@ void test__RegEnumKeyExA__arg2__notuninit() {
 }
 
 void test__RegEnumKeyExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegEnumKeyExW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+  int x = 1;
+  if (cond) { x=100; RegEnumKeyExW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2251,15 +2251,15 @@ void test__RegEnumKeyExW__arg2__notuninit() {
 }
 
 void test__CreateFont__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateFont(arg1);
+  int x = 1;
+  if (cond) { x=100; CreateFont(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__CaptureStackBackTrace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CaptureStackBackTrace(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CaptureStackBackTrace(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2277,8 +2277,8 @@ void test__CaptureStackBackTrace__arg2__notuninit() {
 }
 
 void test___vsnprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _vsnprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2313,8 +2313,8 @@ void test___vsnprintf__arg3__notuninit() {
 }
 
 void test___vsnwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnwprintf(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _vsnwprintf(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2349,8 +2349,8 @@ void test___vsnwprintf__arg3__notuninit() {
 }
 
 void test___vsnprintf_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnprintf_l(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _vsnprintf_l(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2391,8 +2391,8 @@ void test___vsnprintf_l__arg4__notuninit() {
 }
 
 void test___vsnwprintf_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnwprintf_l(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _vsnwprintf_l(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2433,8 +2433,8 @@ void test___vsnwprintf_l__arg4__notuninit() {
 }
 
 void test___vswprintf_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vswprintf_l(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _vswprintf_l(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2475,8 +2475,8 @@ void test___vswprintf_l__arg4__notuninit() {
 }
 
 void test__vsnprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else vsnprintf_s(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; vsnprintf_s(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2517,8 +2517,8 @@ void test__vsnprintf_s__arg4__notuninit() {
 }
 
 void test___vsnprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnprintf_s(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _vsnprintf_s(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2559,8 +2559,8 @@ void test___vsnprintf_s__arg4__notuninit() {
 }
 
 void test___vsnwprintf_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnwprintf_s(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _vsnwprintf_s(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2601,8 +2601,8 @@ void test___vsnwprintf_s__arg4__notuninit() {
 }
 
 void test___vsnprintf_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnprintf_s_l(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; _vsnprintf_s_l(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2649,8 +2649,8 @@ void test___vsnprintf_s_l__arg5__notuninit() {
 }
 
 void test___vsnwprintf_s_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsnwprintf_s_l(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; _vsnwprintf_s_l(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2697,8 +2697,8 @@ void test___vsnwprintf_s_l__arg5__notuninit() {
 }
 
 void test___vsprintf_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _vsprintf_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _vsprintf_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2726,8 +2726,8 @@ void test___vsprintf_l__arg3__notuninit() {
 }
 
 void test____vswprintf_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else __vswprintf_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; __vswprintf_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2755,8 +2755,8 @@ void test____vswprintf_l__arg3__notuninit() {
 }
 
 void test___strdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _strdup(arg1);
+  int x = 1;
+  if (cond) { x=100; _strdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2773,8 +2773,8 @@ void test___strdup__arg1__notuninit() {
 }
 
 void test___wcsdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsdup(arg1);
+  int x = 1;
+  if (cond) { x=100; _wcsdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2791,8 +2791,8 @@ void test___wcsdup__arg1__notuninit() {
 }
 
 void test___mbsdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsdup(arg1);
+  int x = 1;
+  if (cond) { x=100; _mbsdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2809,8 +2809,8 @@ void test___mbsdup__arg1__notuninit() {
 }
 
 void test___tcsdup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsdup(arg1);
+  int x = 1;
+  if (cond) { x=100; _tcsdup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2827,8 +2827,8 @@ void test___tcsdup__arg1__notuninit() {
 }
 
 void test___strdup_dbg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _strdup_dbg(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _strdup_dbg(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2863,8 +2863,8 @@ void test___strdup_dbg__arg4__notuninit() {
 }
 
 void test___wcsdup_dbg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsdup_dbg(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _wcsdup_dbg(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2899,8 +2899,8 @@ void test___wcsdup_dbg__arg4__notuninit() {
 }
 
 void test___tcsdup_dbg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsdup_dbg(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _tcsdup_dbg(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2935,8 +2935,8 @@ void test___tcsdup_dbg__arg4__notuninit() {
 }
 
 void test___mbscmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbscmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbscmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2980,8 +2980,8 @@ void test___mbscmp__arg2__notuninit() {
 }
 
 void test___tcscmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcscmp(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tcscmp(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3025,8 +3025,8 @@ void test___tcscmp__arg2__notuninit() {
 }
 
 void test___snprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _snprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _snprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3055,8 +3055,8 @@ void test___snprintf__arg3__notuninit() {
 }
 
 void test___snwprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _snwprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _snwprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3085,8 +3085,8 @@ void test___snwprintf__arg3__notuninit() {
 }
 
 void test___sntprintf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _sntprintf(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _sntprintf(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3115,8 +3115,8 @@ void test___sntprintf__arg3__notuninit() {
 }
 
 void test__strcpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strcpy_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; strcpy_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3150,8 +3150,8 @@ void test__strcpy_s__arg3__notuninit() {
 }
 
 void test__wcscpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wcscpy_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wcscpy_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3185,8 +3185,8 @@ void test__wcscpy_s__arg3__notuninit() {
 }
 
 void test___mbscpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbscpy_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbscpy_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3220,8 +3220,8 @@ void test___mbscpy_s__arg3__notuninit() {
 }
 
 void test___tcscpy_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcscpy_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _tcscpy_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3255,8 +3255,8 @@ void test___tcscpy_s__arg3__notuninit() {
 }
 
 void test___CrtSetDbgFlag__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _CrtSetDbgFlag(arg1);
+  int x = 1;
+  if (cond) { x=100; _CrtSetDbgFlag(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3274,8 +3274,8 @@ void test___CrtSetDbgFlag__arg1__notuninit() {
 }
 
 void test___stat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3303,8 +3303,8 @@ void test___stat__arg2__notnull() {
 }
 
 void test___tstat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tstat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tstat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3332,8 +3332,8 @@ void test___tstat__arg2__notnull() {
 }
 
 void test___stat32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stat32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stat32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3361,8 +3361,8 @@ void test___stat32__arg2__notnull() {
 }
 
 void test___stat64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stat64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stat64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3390,8 +3390,8 @@ void test___stat64__arg2__notnull() {
 }
 
 void test___tstat64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tstat64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tstat64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3419,8 +3419,8 @@ void test___tstat64__arg2__notnull() {
 }
 
 void test___stati64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stati64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stati64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3448,8 +3448,8 @@ void test___stati64__arg2__notnull() {
 }
 
 void test___tstati64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tstati64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tstati64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3477,8 +3477,8 @@ void test___tstati64__arg2__notnull() {
 }
 
 void test___stat32i64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stat32i64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stat32i64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3506,8 +3506,8 @@ void test___stat32i64__arg2__notnull() {
 }
 
 void test___tstat32i64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tstat32i64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tstat32i64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3535,8 +3535,8 @@ void test___tstat32i64__arg2__notnull() {
 }
 
 void test___stat64i32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _stat64i32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _stat64i32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3564,8 +3564,8 @@ void test___stat64i32__arg2__notnull() {
 }
 
 void test___tstat64i32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tstat64i32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _tstat64i32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3593,8 +3593,8 @@ void test___tstat64i32__arg2__notnull() {
 }
 
 void test___wstat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3622,8 +3622,8 @@ void test___wstat__arg2__notnull() {
 }
 
 void test___wstat32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstat32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstat32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3651,8 +3651,8 @@ void test___wstat32__arg2__notnull() {
 }
 
 void test___wstat64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstat64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstat64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3680,8 +3680,8 @@ void test___wstat64__arg2__notnull() {
 }
 
 void test___wstati64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstati64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstati64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3709,8 +3709,8 @@ void test___wstati64__arg2__notnull() {
 }
 
 void test___wstat32i64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstat32i64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstat32i64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3738,8 +3738,8 @@ void test___wstat32i64__arg2__notnull() {
 }
 
 void test___wstat64i32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wstat64i32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _wstat64i32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3767,8 +3767,8 @@ void test___wstat64i32__arg2__notnull() {
 }
 
 void test___fstat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3791,8 +3791,8 @@ void test___fstat__arg2__notnull() {
 }
 
 void test___fstat32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstat32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstat32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3815,8 +3815,8 @@ void test___fstat32__arg2__notnull() {
 }
 
 void test___fstat64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstat64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstat64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3839,8 +3839,8 @@ void test___fstat64__arg2__notnull() {
 }
 
 void test___fstati64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstati64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstati64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3863,8 +3863,8 @@ void test___fstati64__arg2__notnull() {
 }
 
 void test___fstat32i64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstat32i64(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstat32i64(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3887,8 +3887,8 @@ void test___fstat32i64__arg2__notnull() {
 }
 
 void test___fstat64i32__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fstat64i32(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _fstat64i32(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3911,8 +3911,8 @@ void test___fstat64i32__arg2__notnull() {
 }
 
 void test___fseeki64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fseeki64(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _fseeki64(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3947,8 +3947,8 @@ void test___fseeki64__arg3__notuninit() {
 }
 
 void test___ftelli64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _ftelli64(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _ftelli64(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -3976,8 +3976,8 @@ void test___ftelli64__arg1__notuninit() {
 }
 
 void test___ftell_nolock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _ftell_nolock(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _ftell_nolock(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4005,8 +4005,8 @@ void test___ftell_nolock__arg1__notuninit() {
 }
 
 void test___ftelli64_nolock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _ftelli64_nolock(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _ftelli64_nolock(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4034,8 +4034,8 @@ void test___ftelli64_nolock__arg1__notuninit() {
 }
 
 void test___wfopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wfopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _wfopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4068,8 +4068,8 @@ void test___wfopen__arg2__notuninit() {
 }
 
 void test___tfopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tfopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tfopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4102,8 +4102,8 @@ void test___tfopen__arg2__notuninit() {
 }
 
 void test__strnlen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = strnlen_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = strnlen_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4137,8 +4137,8 @@ void test__strnlen_s__arg2__notuninit() {
 }
 
 void test__wcsnlen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wcsnlen_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = wcsnlen_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4172,8 +4172,8 @@ void test__wcsnlen_s__arg2__notuninit() {
 }
 
 void test___mbsnlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsnlen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbsnlen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4207,8 +4207,8 @@ void test___mbsnlen__arg2__notuninit() {
 }
 
 void test___mbstrnlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbstrnlen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbstrnlen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4242,8 +4242,8 @@ void test___mbstrnlen__arg2__notuninit() {
 }
 
 void test___mbsnlen_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsnlen_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _mbsnlen_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4283,8 +4283,8 @@ void test___mbsnlen_l__arg3__notuninit() {
 }
 
 void test___mbstrnlen_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbstrnlen_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _mbstrnlen_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4324,8 +4324,8 @@ void test___mbstrnlen_l__arg3__notuninit() {
 }
 
 void test__WideCharToMultiByte__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WideCharToMultiByte(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+  int x = 1;
+  if (cond) { x=100; WideCharToMultiByte(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4373,8 +4373,8 @@ void test__WideCharToMultiByte__arg7__notuninit() {
 }
 
 void test__PathIsDirectory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = PathIsDirectory(arg1);
+  int x = 1;
+  if (cond) { x=100; result = PathIsDirectory(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4397,8 +4397,8 @@ void test__PathIsDirectory__arg1__notuninit() {
 }
 
 void test__PathIsDirectoryA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = PathIsDirectoryA(arg1);
+  int x = 1;
+  if (cond) { x=100; result = PathIsDirectoryA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4421,8 +4421,8 @@ void test__PathIsDirectoryA__arg1__notuninit() {
 }
 
 void test__PathIsDirectoryW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = PathIsDirectoryW(arg1);
+  int x = 1;
+  if (cond) { x=100; result = PathIsDirectoryW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4445,8 +4445,8 @@ void test__PathIsDirectoryW__arg1__notuninit() {
 }
 
 void test__SetConsoleTextAttribute__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetConsoleTextAttribute(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetConsoleTextAttribute(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4470,8 +4470,8 @@ void test__SetConsoleTextAttribute__arg2__notuninit() {
 }
 
 void test___wfopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wfopen_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _wfopen_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4504,8 +4504,8 @@ void test___wfopen_s__arg3__notuninit() {
 }
 
 void test___tfopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tfopen_s(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _tfopen_s(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4538,8 +4538,8 @@ void test___tfopen_s__arg3__notuninit() {
 }
 
 void test__DeleteFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DeleteFile(arg1);
+  int x = 1;
+  if (cond) { x=100; DeleteFile(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4557,8 +4557,8 @@ void test__DeleteFile__arg1__notuninit() {
 }
 
 void test__DeleteFileA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DeleteFileA(arg1);
+  int x = 1;
+  if (cond) { x=100; DeleteFileA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4576,8 +4576,8 @@ void test__DeleteFileA__arg1__notuninit() {
 }
 
 void test__DeleteFileW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DeleteFileW(arg1);
+  int x = 1;
+  if (cond) { x=100; DeleteFileW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4595,8 +4595,8 @@ void test__DeleteFileW__arg1__notuninit() {
 }
 
 void test__GetStdHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetStdHandle(arg1);
+  int x = 1;
+  if (cond) { x=100; result = GetStdHandle(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4619,8 +4619,8 @@ void test__GetStdHandle__arg1__notuninit() {
 }
 
 void test__SetStdHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetStdHandle(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetStdHandle(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4644,8 +4644,8 @@ void test__SetStdHandle__arg2__notuninit() {
 }
 
 void test___access__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _access(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _access(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4674,8 +4674,8 @@ void test___access__arg2__notuninit() {
 }
 
 void test___waccess__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _waccess(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _waccess(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4704,8 +4704,8 @@ void test___waccess__arg2__notuninit() {
 }
 
 void test___taccess__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _taccess(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _taccess(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4734,8 +4734,8 @@ void test___taccess__arg2__notuninit() {
 }
 
 void test__PeekMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PeekMessage(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; PeekMessage(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4776,8 +4776,8 @@ void test__PeekMessage__arg5__notuninit() {
 }
 
 void test__PeekMessageA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PeekMessageA(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; PeekMessageA(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4818,8 +4818,8 @@ void test__PeekMessageA__arg5__notuninit() {
 }
 
 void test__PeekMessageW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PeekMessageW(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; PeekMessageW(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4860,8 +4860,8 @@ void test__PeekMessageW__arg5__notuninit() {
 }
 
 void test__GetMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetMessage(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetMessage(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4896,8 +4896,8 @@ void test__GetMessage__arg4__notuninit() {
 }
 
 void test__GetMessageA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetMessageA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetMessageA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4932,8 +4932,8 @@ void test__GetMessageA__arg4__notuninit() {
 }
 
 void test__GetMessageW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetMessageW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetMessageW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4968,8 +4968,8 @@ void test__GetMessageW__arg4__notuninit() {
 }
 
 void test__TranslateMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else TranslateMessage(arg1);
+  int x = 1;
+  if (cond) { x=100; TranslateMessage(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -4992,8 +4992,8 @@ void test__TranslateMessage__arg1__notuninit() {
 }
 
 void test__DispatchMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DispatchMessage(arg1);
+  int x = 1;
+  if (cond) { x=100; DispatchMessage(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5016,8 +5016,8 @@ void test__DispatchMessage__arg1__notuninit() {
 }
 
 void test__DispatchMessageA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DispatchMessageA(arg1);
+  int x = 1;
+  if (cond) { x=100; DispatchMessageA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5040,8 +5040,8 @@ void test__DispatchMessageA__arg1__notuninit() {
 }
 
 void test__DispatchMessageW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DispatchMessageW(arg1);
+  int x = 1;
+  if (cond) { x=100; DispatchMessageW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5064,8 +5064,8 @@ void test__DispatchMessageW__arg1__notuninit() {
 }
 
 void test__SendMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SendMessage(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; SendMessage(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5100,8 +5100,8 @@ void test__SendMessage__arg4__notuninit() {
 }
 
 void test__SendMessageA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SendMessageA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; SendMessageA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5136,8 +5136,8 @@ void test__SendMessageA__arg4__notuninit() {
 }
 
 void test__SendMessageW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SendMessageW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; SendMessageW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5172,8 +5172,8 @@ void test__SendMessageW__arg4__notuninit() {
 }
 
 void test__PostMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PostMessage(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; PostMessage(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5208,8 +5208,8 @@ void test__PostMessage__arg4__notuninit() {
 }
 
 void test__PostMessageA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PostMessageA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; PostMessageA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5244,8 +5244,8 @@ void test__PostMessageA__arg4__notuninit() {
 }
 
 void test__PostMessageW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PostMessageW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; PostMessageW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5280,8 +5280,8 @@ void test__PostMessageW__arg4__notuninit() {
 }
 
 void test__PostQuitMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PostQuitMessage(arg1);
+  int x = 1;
+  if (cond) { x=100; PostQuitMessage(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5299,8 +5299,8 @@ void test__PostQuitMessage__arg1__notuninit() {
 }
 
 void test__DefWindowProc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DefWindowProc(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; DefWindowProc(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5341,8 +5341,8 @@ void test__DefWindowProc__arg4__notuninit() {
 }
 
 void test__DefWindowProcA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DefWindowProcA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; DefWindowProcA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5383,8 +5383,8 @@ void test__DefWindowProcA__arg4__notuninit() {
 }
 
 void test__DefWindowProcW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DefWindowProcW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; DefWindowProcW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5425,8 +5425,8 @@ void test__DefWindowProcW__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileInt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetPrivateProfileInt(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = GetPrivateProfileInt(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5482,8 +5482,8 @@ void test__GetPrivateProfileInt__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileIntA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetPrivateProfileIntA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = GetPrivateProfileIntA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5539,8 +5539,8 @@ void test__GetPrivateProfileIntA__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileIntW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetPrivateProfileIntW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = GetPrivateProfileIntW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5596,8 +5596,8 @@ void test__GetPrivateProfileIntW__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSection(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSection(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5642,8 +5642,8 @@ void test__GetPrivateProfileSection__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileSectionA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSectionA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSectionA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5688,8 +5688,8 @@ void test__GetPrivateProfileSectionA__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileSectionW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSectionW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSectionW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5734,8 +5734,8 @@ void test__GetPrivateProfileSectionW__arg4__notuninit() {
 }
 
 void test__GetPrivateProfileSectionNames__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSectionNames(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSectionNames(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5769,8 +5769,8 @@ void test__GetPrivateProfileSectionNames__arg3__notuninit() {
 }
 
 void test__GetPrivateProfileSectionNamesA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSectionNamesA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSectionNamesA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5804,8 +5804,8 @@ void test__GetPrivateProfileSectionNamesA__arg3__notuninit() {
 }
 
 void test__GetPrivateProfileSectionNamesW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileSectionNamesW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileSectionNamesW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5839,8 +5839,8 @@ void test__GetPrivateProfileSectionNamesW__arg3__notuninit() {
 }
 
 void test__GetPrivateProfileString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileString(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileString(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5892,8 +5892,8 @@ void test__GetPrivateProfileString__arg6__notuninit() {
 }
 
 void test__GetPrivateProfileStringA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileStringA(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileStringA(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5945,8 +5945,8 @@ void test__GetPrivateProfileStringA__arg6__notuninit() {
 }
 
 void test__GetPrivateProfileStringW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileStringW(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileStringW(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -5998,8 +5998,8 @@ void test__GetPrivateProfileStringW__arg6__notuninit() {
 }
 
 void test__GetPrivateProfileStruct__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileStruct(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileStruct(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6055,8 +6055,8 @@ void test__GetPrivateProfileStruct__arg5__notuninit() {
 }
 
 void test__GetPrivateProfileStructA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileStructA(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileStructA(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6112,8 +6112,8 @@ void test__GetPrivateProfileStructA__arg5__notuninit() {
 }
 
 void test__GetPrivateProfileStructW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetPrivateProfileStructW(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; GetPrivateProfileStructW(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6169,8 +6169,8 @@ void test__GetPrivateProfileStructW__arg5__notuninit() {
 }
 
 void test__BeginPaint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else BeginPaint(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; BeginPaint(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6193,8 +6193,8 @@ void test__BeginPaint__arg2__notnull() {
 }
 
 void test__EndPaint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else EndPaint(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; EndPaint(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6217,8 +6217,8 @@ void test__EndPaint__arg2__notnull() {
 }
 
 void test__GetStockObject__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetStockObject(arg1);
+  int x = 1;
+  if (cond) { x=100; result = GetStockObject(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6246,8 +6246,8 @@ void test__GetStockObject__arg1__notuninit() {
 }
 
 void test__LoadIcon__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = LoadIcon(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = LoadIcon(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6281,8 +6281,8 @@ void test__LoadIcon__arg2__notuninit() {
 }
 
 void test__LoadIconA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = LoadIconA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = LoadIconA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6316,8 +6316,8 @@ void test__LoadIconA__arg2__notuninit() {
 }
 
 void test__LoadIconW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = LoadIconW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = LoadIconW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6351,8 +6351,8 @@ void test__LoadIconW__arg2__notuninit() {
 }
 
 void test__CreateSolidBrush__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateSolidBrush(arg1);
+  int x = 1;
+  if (cond) { x=100; result = CreateSolidBrush(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6375,8 +6375,8 @@ void test__CreateSolidBrush__arg1__notuninit() {
 }
 
 void test__UpdateWindow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else UpdateWindow(arg1);
+  int x = 1;
+  if (cond) { x=100; UpdateWindow(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6399,8 +6399,8 @@ void test__UpdateWindow__arg1__notuninit() {
 }
 
 void test__EnableWindow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else EnableWindow(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; EnableWindow(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6429,8 +6429,8 @@ void test__EnableWindow__arg2__notuninit() {
 }
 
 void test__CreateWindow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindow(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindow(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6513,8 +6513,8 @@ void test__CreateWindow__arg9__notuninit() {
 }
 
 void test__CreateWindowA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindowA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindowA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6597,8 +6597,8 @@ void test__CreateWindowA__arg9__notuninit() {
 }
 
 void test__CreateWindowW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindowW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindowW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6681,8 +6681,8 @@ void test__CreateWindowW__arg9__notuninit() {
 }
 
 void test__CreateWindowEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindowEx(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindowEx(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6771,8 +6771,8 @@ void test__CreateWindowEx__arg9__notuninit() {
 }
 
 void test__CreateWindowExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindowExA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindowExA(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6861,8 +6861,8 @@ void test__CreateWindowExA__arg9__notuninit() {
 }
 
 void test__CreateWindowExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWindowExW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+  int x = 1;
+  if (cond) { x=100; result = CreateWindowExW(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6951,8 +6951,8 @@ void test__CreateWindowExW__arg9__notuninit() {
 }
 
 void test__SetWindowText__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetWindowText(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetWindowText(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -6986,8 +6986,8 @@ void test__SetWindowText__arg2__notuninit() {
 }
 
 void test__SetWindowTextA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetWindowTextA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetWindowTextA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7021,8 +7021,8 @@ void test__SetWindowTextA__arg2__notuninit() {
 }
 
 void test__SetWindowTextW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetWindowTextW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetWindowTextW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7056,8 +7056,8 @@ void test__SetWindowTextW__arg2__notuninit() {
 }
 
 void test__RegisterClass__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegisterClass(arg1);
+  int x = 1;
+  if (cond) { x=100; RegisterClass(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7080,8 +7080,8 @@ void test__RegisterClass__arg1__notuninit() {
 }
 
 void test__RegisterClassEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RegisterClassEx(arg1);
+  int x = 1;
+  if (cond) { x=100; RegisterClassEx(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7104,8 +7104,8 @@ void test__RegisterClassEx__arg1__notuninit() {
 }
 
 void test__UnregisterClass__noreturn() {
-  int x = 100;
-  if (cond) x=1; else UnregisterClass(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; UnregisterClass(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7123,8 +7123,8 @@ void test__UnregisterClass__arg2__notuninit() {
 }
 
 void test__UnregisterClassA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else UnregisterClassA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; UnregisterClassA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7142,8 +7142,8 @@ void test__UnregisterClassA__arg2__notuninit() {
 }
 
 void test__UnregisterClassW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else UnregisterClassW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; UnregisterClassW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7161,8 +7161,8 @@ void test__UnregisterClassW__arg2__notuninit() {
 }
 
 void test__MessageBox__noreturn() {
-  int x = 100;
-  if (cond) x=1; else MessageBox(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; MessageBox(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7198,8 +7198,8 @@ void test__MessageBox__arg4__notuninit() {
 }
 
 void test__MessageBoxA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else MessageBoxA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; MessageBoxA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7235,8 +7235,8 @@ void test__MessageBoxA__arg4__notuninit() {
 }
 
 void test__MessageBoxW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else MessageBoxW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; MessageBoxW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7272,8 +7272,8 @@ void test__MessageBoxW__arg4__notuninit() {
 }
 
 void test__GlobalLock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GlobalLock(arg1);
+  int x = 1;
+  if (cond) { x=100; GlobalLock(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7296,8 +7296,8 @@ void test__GlobalLock__arg1__notuninit() {
 }
 
 void test__GlobalUnlock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GlobalUnlock(arg1);
+  int x = 1;
+  if (cond) { x=100; GlobalUnlock(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7320,8 +7320,8 @@ void test__GlobalUnlock__arg1__notuninit() {
 }
 
 void test__OpenClipboard__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenClipboard(arg1);
+  int x = 1;
+  if (cond) { x=100; OpenClipboard(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7339,8 +7339,8 @@ void test__OpenClipboard__arg1__notuninit() {
 }
 
 void test__EmptyClipboard__noreturn() {
-  int x = 100;
-  if (cond) x=1; else EmptyClipboard();
+  int x = 1;
+  if (cond) { x=100; EmptyClipboard(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7352,8 +7352,8 @@ void test__EmptyClipboard__leakignore() {
 }
 
 void test__CloseClipboard__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CloseClipboard();
+  int x = 1;
+  if (cond) { x=100; CloseClipboard(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7365,8 +7365,8 @@ void test__CloseClipboard__leakignore() {
 }
 
 void test__SetClipboardData__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetClipboardData(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetClipboardData(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7390,8 +7390,8 @@ void test__SetClipboardData__arg2__notuninit() {
 }
 
 void test___rmdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _rmdir(arg1);
+  int x = 1;
+  if (cond) { x=100; _rmdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7414,8 +7414,8 @@ void test___rmdir__arg1__notuninit() {
 }
 
 void test___wrmdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wrmdir(arg1);
+  int x = 1;
+  if (cond) { x=100; _wrmdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7438,8 +7438,8 @@ void test___wrmdir__arg1__notuninit() {
 }
 
 void test___mkdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mkdir(arg1);
+  int x = 1;
+  if (cond) { x=100; _mkdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7462,8 +7462,8 @@ void test___mkdir__arg1__notuninit() {
 }
 
 void test___wmkdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wmkdir(arg1);
+  int x = 1;
+  if (cond) { x=100; _wmkdir(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7486,8 +7486,8 @@ void test___wmkdir__arg1__notuninit() {
 }
 
 void test___abs64__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _abs64(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _abs64(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7520,8 +7520,8 @@ void test___abs64__arg1__notuninit() {
 }
 
 void test__CreateWaitableTimer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateWaitableTimer(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = CreateWaitableTimer(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7550,8 +7550,8 @@ void test__CreateWaitableTimer__arg3__notuninit() {
 }
 
 void test__SetWaitableTimer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetWaitableTimer(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; SetWaitableTimer(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7604,8 +7604,8 @@ void test__SetWaitableTimer__arg6__notuninit() {
 }
 
 void test__WaitForSingleObject__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WaitForSingleObject(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; WaitForSingleObject(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7629,8 +7629,8 @@ void test__WaitForSingleObject__arg2__notuninit() {
 }
 
 void test___pclose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _pclose(arg1);
+  int x = 1;
+  if (cond) { x=100; _pclose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7647,8 +7647,8 @@ void test___pclose__arg1__notuninit() {
 }
 
 void test___popen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _popen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _popen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7681,8 +7681,8 @@ void test___popen__arg2__notuninit() {
 }
 
 void test___wpopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wpopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _wpopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7715,8 +7715,8 @@ void test___wpopen__arg2__notuninit() {
 }
 
 void test___tpopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tpopen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tpopen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7749,8 +7749,8 @@ void test___tpopen__arg2__notuninit() {
 }
 
 void test___mktemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mktemp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _mktemp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7778,8 +7778,8 @@ void test___mktemp__arg1__notuninit() {
 }
 
 void test___wmktemp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wmktemp(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _wmktemp(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7807,8 +7807,8 @@ void test___wmktemp__arg1__notuninit() {
 }
 
 void test__FindFirstFileEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFileEx(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFileEx(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7853,8 +7853,8 @@ void test__FindFirstFileEx__arg6__notuninit() {
 }
 
 void test__FindFirstFileExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFileExA(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFileExA(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7899,8 +7899,8 @@ void test__FindFirstFileExA__arg6__notuninit() {
 }
 
 void test__FindFirstFileExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFileExW(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFileExW(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7945,8 +7945,8 @@ void test__FindFirstFileExW__arg6__notuninit() {
 }
 
 void test__FindFirstFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFile(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFile(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -7973,8 +7973,8 @@ void test__FindFirstFile__arg2__notnull() {
 }
 
 void test__FindFirstFileW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFileW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFileW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8001,8 +8001,8 @@ void test__FindFirstFileW__arg2__notnull() {
 }
 
 void test__FindFirstFileA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindFirstFileA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindFirstFileA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8029,8 +8029,8 @@ void test__FindFirstFileA__arg2__notnull() {
 }
 
 void test__FindClose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FindClose(arg1);
+  int x = 1;
+  if (cond) { x=100; FindClose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8047,8 +8047,8 @@ void test__FindClose__arg1__notuninit() {
 }
 
 void test__CreateThread__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = CreateThread(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; result = CreateThread(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8089,8 +8089,8 @@ void test__CreateThread__arg5__notuninit() {
 }
 
 void test__FindNextFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindNextFile(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindNextFile(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8123,8 +8123,8 @@ void test__FindNextFile__arg2__notnull() {
 }
 
 void test__FindNextFileW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindNextFileW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindNextFileW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8157,8 +8157,8 @@ void test__FindNextFileW__arg2__notnull() {
 }
 
 void test__FindNextFileA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = FindNextFileA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = FindNextFileA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8191,8 +8191,8 @@ void test__FindNextFileA__arg2__notnull() {
 }
 
 void test__SetEnvironmentVariable__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetEnvironmentVariable(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetEnvironmentVariable(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8210,8 +8210,8 @@ void test__SetEnvironmentVariable__arg1__notuninit() {
 }
 
 void test__SetEnvironmentVariableW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetEnvironmentVariableW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetEnvironmentVariableW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8229,8 +8229,8 @@ void test__SetEnvironmentVariableW__arg1__notuninit() {
 }
 
 void test__SetEnvironmentVariableA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetEnvironmentVariableA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetEnvironmentVariableA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8248,8 +8248,8 @@ void test__SetEnvironmentVariableA__arg1__notuninit() {
 }
 
 void test__QueryDosDevice__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QueryDosDevice(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QueryDosDevice(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8278,8 +8278,8 @@ void test__QueryDosDevice__arg3__notuninit() {
 }
 
 void test__QueryDosDeviceW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QueryDosDeviceW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QueryDosDeviceW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8308,8 +8308,8 @@ void test__QueryDosDeviceW__arg3__notuninit() {
 }
 
 void test__QueryDosDeviceA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = QueryDosDeviceA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = QueryDosDeviceA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8338,8 +8338,8 @@ void test__QueryDosDeviceA__arg3__notuninit() {
 }
 
 void test__GetDefaultCommConfig__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetDefaultCommConfig(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = GetDefaultCommConfig(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8367,8 +8367,8 @@ void test__GetDefaultCommConfig__arg2__notnull() {
 }
 
 void test__GetDefaultCommConfigW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetDefaultCommConfigW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = GetDefaultCommConfigW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8396,8 +8396,8 @@ void test__GetDefaultCommConfigW__arg2__notnull() {
 }
 
 void test__GetDefaultCommConfigA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetDefaultCommConfigA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = GetDefaultCommConfigA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8425,8 +8425,8 @@ void test__GetDefaultCommConfigA__arg2__notnull() {
 }
 
 void test__GetTempPath__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetTempPath(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetTempPath(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8444,8 +8444,8 @@ void test__GetTempPath__arg1__notuninit() {
 }
 
 void test__GetTempPathW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetTempPathW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetTempPathW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8463,8 +8463,8 @@ void test__GetTempPathW__arg1__notuninit() {
 }
 
 void test__GetTempPathA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetTempPathA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetTempPathA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8482,8 +8482,8 @@ void test__GetTempPathA__arg1__notuninit() {
 }
 
 void test__SetupDiDestroyDeviceInfoList__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetupDiDestroyDeviceInfoList(arg1);
+  int x = 1;
+  if (cond) { x=100; SetupDiDestroyDeviceInfoList(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8501,8 +8501,8 @@ void test__SetupDiDestroyDeviceInfoList__arg1__notuninit() {
 }
 
 void test__SetupDiGetDeviceInstanceId__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetupDiGetDeviceInstanceId(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; SetupDiGetDeviceInstanceId(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8532,8 +8532,8 @@ void test__SetupDiGetDeviceInstanceId__arg4__notuninit() {
 }
 
 void test__SetupDiEnumDeviceInfo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetupDiEnumDeviceInfo(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; SetupDiEnumDeviceInfo(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8557,8 +8557,8 @@ void test__SetupDiEnumDeviceInfo__arg2__notuninit() {
 }
 
 void test__SetupDiGetClassDevs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetupDiGetClassDevs(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; SetupDiGetClassDevs(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8588,8 +8588,8 @@ void test__SetupDiGetClassDevs__arg4__notuninit() {
 }
 
 void test___mbsstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbsstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8628,8 +8628,8 @@ void test___mbsstr__arg2__notuninit() {
 }
 
 void test___tcsstr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsstr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tcsstr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8668,8 +8668,8 @@ void test___tcsstr__arg2__notuninit() {
 }
 
 void test___mbsstr_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsstr_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _mbsstr_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8714,8 +8714,8 @@ void test___mbsstr_l__arg3__notuninit() {
 }
 
 void test___memccpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _memccpy(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _memccpy(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8755,15 +8755,15 @@ void test___memccpy__arg4__notuninit() {
 }
 
 void test___fcloseall__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _fcloseall();
+  int x = 1;
+  if (cond) { x=100; _fcloseall(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test___open__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _open(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _open(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8797,8 +8797,8 @@ void test___open__arg3__notuninit() {
 }
 
 void test___wopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wopen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _wopen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8832,8 +8832,8 @@ void test___wopen__arg3__notuninit() {
 }
 
 void test___topen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _topen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _topen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8867,8 +8867,8 @@ void test___topen__arg3__notuninit() {
 }
 
 void test___close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _close(arg1);
+  int x = 1;
+  if (cond) { x=100; _close(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8880,8 +8880,8 @@ void test___close__arg1__notuninit() {
 }
 
 void test___swab__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _swab(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _swab(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8920,8 +8920,8 @@ void test___swab__arg3__notuninit() {
 }
 
 void test___strnicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _strnicmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _strnicmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -8971,8 +8971,8 @@ void test___strnicmp__arg3__notuninit() {
 }
 
 void test___wcsnicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wcsnicmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _wcsnicmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9022,8 +9022,8 @@ void test___wcsnicmp__arg3__notuninit() {
 }
 
 void test___mbsnicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsnicmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _mbsnicmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9073,8 +9073,8 @@ void test___mbsnicmp__arg3__notuninit() {
 }
 
 void test___tcsncicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsncicmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _tcsncicmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9124,8 +9124,8 @@ void test___tcsncicmp__arg3__notuninit() {
 }
 
 void test___tcsnicmp__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsnicmp(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _tcsnicmp(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9175,8 +9175,8 @@ void test___tcsnicmp__arg3__notuninit() {
 }
 
 void test___strnicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _strnicmp_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _strnicmp_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9232,8 +9232,8 @@ void test___strnicmp_l__arg4__notuninit() {
 }
 
 void test___wcsnicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wcsnicmp_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _wcsnicmp_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9289,8 +9289,8 @@ void test___wcsnicmp_l__arg4__notuninit() {
 }
 
 void test___mbsnicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsnicmp_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _mbsnicmp_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9346,8 +9346,8 @@ void test___mbsnicmp_l__arg4__notuninit() {
 }
 
 void test___tcsncicmp_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsncicmp_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _tcsncicmp_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9403,8 +9403,8 @@ void test___tcsncicmp_l__arg4__notuninit() {
 }
 
 void test___malloc_dbg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _malloc_dbg(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _malloc_dbg(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9439,8 +9439,8 @@ void test___malloc_dbg__arg4__notuninit() {
 }
 
 void test___aligned_malloc_dbg__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _aligned_malloc_dbg(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _aligned_malloc_dbg(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9475,8 +9475,8 @@ void test___aligned_malloc_dbg__arg4__notuninit() {
 }
 
 void test___aligned_malloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _aligned_malloc(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _aligned_malloc(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9499,8 +9499,8 @@ void test___aligned_malloc__arg2__notuninit() {
 }
 
 void test___mbslen_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbslen_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbslen_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9539,8 +9539,8 @@ void test___mbslen_l__arg2__notuninit() {
 }
 
 void test___mbstrlen_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbstrlen_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbstrlen_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9579,8 +9579,8 @@ void test___mbstrlen_l__arg2__notuninit() {
 }
 
 void test___tcsclen_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsclen_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tcsclen_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9619,8 +9619,8 @@ void test___tcsclen_l__arg2__notuninit() {
 }
 
 void test___mbslen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbslen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _mbslen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9653,8 +9653,8 @@ void test___mbslen__arg1__notuninit() {
 }
 
 void test___mbstrlen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbstrlen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _mbstrlen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9687,8 +9687,8 @@ void test___mbstrlen__arg1__notuninit() {
 }
 
 void test___tcslen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcslen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _tcslen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9721,8 +9721,8 @@ void test___tcslen__arg1__notuninit() {
 }
 
 void test___tcsclen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsclen(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _tcsclen(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9755,8 +9755,8 @@ void test___tcsclen__arg1__notuninit() {
 }
 
 void test___mbsrchr_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsrchr_l(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _mbsrchr_l(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9796,8 +9796,8 @@ void test___mbsrchr_l__arg3__notuninit() {
 }
 
 void test___mbsrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _mbsrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _mbsrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9831,8 +9831,8 @@ void test___mbsrchr__arg2__notuninit() {
 }
 
 void test___tcsrchr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tcsrchr(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tcsrchr(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9866,8 +9866,8 @@ void test___tcsrchr__arg2__notuninit() {
 }
 
 void test___strftime_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _strftime_l(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _strftime_l(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9918,8 +9918,8 @@ void test___strftime_l__arg5__notuninit() {
 }
 
 void test___wcsftime_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsftime_l(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; _wcsftime_l(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -9970,8 +9970,8 @@ void test___wcsftime_l__arg5__notuninit() {
 }
 
 void test___tcsftime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsftime(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _tcsftime(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10016,8 +10016,8 @@ void test___tcsftime__arg4__notuninit() {
 }
 
 void test___wfreopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wfreopen_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _wfreopen_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10062,8 +10062,8 @@ void test___wfreopen_s__arg4__notuninit() {
 }
 
 void test___tfreopen_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tfreopen_s(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = _tfreopen_s(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10108,8 +10108,8 @@ void test___tfreopen_s__arg4__notuninit() {
 }
 
 void test___wfreopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _wfreopen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _wfreopen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10148,8 +10148,8 @@ void test___wfreopen__arg3__notuninit() {
 }
 
 void test___tfreopen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tfreopen(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = _tfreopen(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10188,8 +10188,8 @@ void test___tfreopen__arg3__notuninit() {
 }
 
 void test___mbsncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbsncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10228,8 +10228,8 @@ void test___mbsncpy__arg3__notuninit() {
 }
 
 void test___mbsnbcpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsnbcpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _mbsnbcpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10268,8 +10268,8 @@ void test___mbsnbcpy__arg3__notuninit() {
 }
 
 void test___tcsncpy__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsncpy(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; _tcsncpy(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10308,8 +10308,8 @@ void test___tcsncpy__arg3__notuninit() {
 }
 
 void test___strncpy_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _strncpy_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _strncpy_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10354,8 +10354,8 @@ void test___strncpy_l__arg4__notuninit() {
 }
 
 void test___wcsncpy_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _wcsncpy_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _wcsncpy_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10400,8 +10400,8 @@ void test___wcsncpy_l__arg4__notuninit() {
 }
 
 void test___mbsncpy_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _mbsncpy_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _mbsncpy_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10446,8 +10446,8 @@ void test___mbsncpy_l__arg4__notuninit() {
 }
 
 void test___tcsncpy_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _tcsncpy_l(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; _tcsncpy_l(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10492,8 +10492,8 @@ void test___tcsncpy_l__arg4__notuninit() {
 }
 
 void test___localtime32_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _localtime32_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _localtime32_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10515,8 +10515,8 @@ void test___localtime32_s__arg2__notnull() {
 }
 
 void test___localtime64_s__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _localtime64_s(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; _localtime64_s(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10538,8 +10538,8 @@ void test___localtime64_s__arg2__notnull() {
 }
 
 void test__CreateDirectory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateDirectory(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; CreateDirectory(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10563,8 +10563,8 @@ void test__CreateDirectory__arg2__notuninit() {
 }
 
 void test__CreateDirectoryA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateDirectoryA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; CreateDirectoryA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10588,8 +10588,8 @@ void test__CreateDirectoryA__arg2__notuninit() {
 }
 
 void test__CreateDirectoryW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateDirectoryW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; CreateDirectoryW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10613,8 +10613,8 @@ void test__CreateDirectoryW__arg2__notuninit() {
 }
 
 void test__RemoveDirectory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RemoveDirectory(arg1);
+  int x = 1;
+  if (cond) { x=100; RemoveDirectory(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10632,8 +10632,8 @@ void test__RemoveDirectory__arg1__notuninit() {
 }
 
 void test__RemoveDirectoryA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RemoveDirectoryA(arg1);
+  int x = 1;
+  if (cond) { x=100; RemoveDirectoryA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10651,8 +10651,8 @@ void test__RemoveDirectoryA__arg1__notuninit() {
 }
 
 void test__RemoveDirectoryW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else RemoveDirectoryW(arg1);
+  int x = 1;
+  if (cond) { x=100; RemoveDirectoryW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10670,8 +10670,8 @@ void test__RemoveDirectoryW__arg1__notuninit() {
 }
 
 void test____isascii__noreturn() {
-  int x = 100;
-  if (cond) x=1; else __isascii(arg1);
+  int x = 1;
+  if (cond) { x=100; __isascii(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10689,8 +10689,8 @@ void test____isascii__arg1__notuninit() {
 }
 
 void test__iswascii__noreturn() {
-  int x = 100;
-  if (cond) x=1; else iswascii(arg1);
+  int x = 1;
+  if (cond) { x=100; iswascii(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10708,8 +10708,8 @@ void test__iswascii__arg1__notuninit() {
 }
 
 void test___getchar__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _getchar();
+  int x = 1;
+  if (cond) { x=100; _getchar(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10721,8 +10721,8 @@ void test___getchar__leakignore() {
 }
 
 void test___getch_nolock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _getch_nolock();
+  int x = 1;
+  if (cond) { x=100; _getch_nolock(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10734,8 +10734,8 @@ void test___getch_nolock__leakignore() {
 }
 
 void test___getwch__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _getwch();
+  int x = 1;
+  if (cond) { x=100; _getwch(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10747,8 +10747,8 @@ void test___getwch__leakignore() {
 }
 
 void test___getwch_nolock__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _getwch_nolock();
+  int x = 1;
+  if (cond) { x=100; _getwch_nolock(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10760,8 +10760,8 @@ void test___getwch_nolock__leakignore() {
 }
 
 void test__Sleep__noreturn() {
-  int x = 100;
-  if (cond) x=1; else Sleep(arg1);
+  int x = 1;
+  if (cond) { x=100; Sleep(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10784,8 +10784,8 @@ void test__Sleep__arg1__notuninit() {
 }
 
 void test__SleepEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SleepEx(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SleepEx(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10814,8 +10814,8 @@ void test__SleepEx__arg2__notuninit() {
 }
 
 void test__LoadLibrary__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibrary(arg1);
+  int x = 1;
+  if (cond) { x=100; LoadLibrary(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10832,8 +10832,8 @@ void test__LoadLibrary__arg1__notuninit() {
 }
 
 void test__LoadLibraryA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibraryA(arg1);
+  int x = 1;
+  if (cond) { x=100; LoadLibraryA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10850,8 +10850,8 @@ void test__LoadLibraryA__arg1__notuninit() {
 }
 
 void test__LoadLibraryW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibraryW(arg1);
+  int x = 1;
+  if (cond) { x=100; LoadLibraryW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10868,8 +10868,8 @@ void test__LoadLibraryW__arg1__notuninit() {
 }
 
 void test__LoadLibraryEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibraryEx(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; LoadLibraryEx(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10887,8 +10887,8 @@ void test__LoadLibraryEx__arg3__notuninit() {
 }
 
 void test__LoadLibraryExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibraryExA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; LoadLibraryExA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10906,8 +10906,8 @@ void test__LoadLibraryExA__arg3__notuninit() {
 }
 
 void test__LoadLibraryExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LoadLibraryExW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; LoadLibraryExW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10925,8 +10925,8 @@ void test__LoadLibraryExW__arg3__notuninit() {
 }
 
 void test__GetModuleHandle__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetModuleHandle(arg1);
+  int x = 1;
+  if (cond) { x=100; result = GetModuleHandle(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10949,8 +10949,8 @@ void test__GetModuleHandle__arg1__notuninit() {
 }
 
 void test__GetModuleHandleA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetModuleHandleA(arg1);
+  int x = 1;
+  if (cond) { x=100; result = GetModuleHandleA(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10973,8 +10973,8 @@ void test__GetModuleHandleA__arg1__notuninit() {
 }
 
 void test__GetModuleHandleW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetModuleHandleW(arg1);
+  int x = 1;
+  if (cond) { x=100; result = GetModuleHandleW(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -10997,8 +10997,8 @@ void test__GetModuleHandleW__arg1__notuninit() {
 }
 
 void test__GetModuleHandleEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetModuleHandleEx(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetModuleHandleEx(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11021,8 +11021,8 @@ void test__GetModuleHandleEx__arg3__notnull() {
 }
 
 void test__GetModuleHandleExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetModuleHandleExA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetModuleHandleExA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11045,8 +11045,8 @@ void test__GetModuleHandleExA__arg3__notnull() {
 }
 
 void test__GetModuleHandleExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetModuleHandleExW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetModuleHandleExW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11069,8 +11069,8 @@ void test__GetModuleHandleExW__arg3__notnull() {
 }
 
 void test__FreeLibrary__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FreeLibrary(arg1);
+  int x = 1;
+  if (cond) { x=100; FreeLibrary(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11087,8 +11087,8 @@ void test__FreeLibrary__arg1__notuninit() {
 }
 
 void test__FreeLibraryAndExitThread__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FreeLibraryAndExitThread(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; FreeLibraryAndExitThread(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11116,8 +11116,8 @@ void test__FreeLibraryAndExitThread__arg2__notuninit() {
 }
 
 void test__GetProcAddress__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetProcAddress(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = GetProcAddress(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11156,8 +11156,8 @@ void test__GetProcAddress__arg2__notuninit() {
 }
 
 void test__CreateEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEvent(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEvent(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11197,8 +11197,8 @@ void test__CreateEvent__arg4__notuninit() {
 }
 
 void test__CreateEventA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEventA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEventA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11238,8 +11238,8 @@ void test__CreateEventA__arg4__notuninit() {
 }
 
 void test__CreateEventW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEventW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEventW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11279,8 +11279,8 @@ void test__CreateEventW__arg4__notuninit() {
 }
 
 void test__CreateEventEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEventEx(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEventEx(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11330,8 +11330,8 @@ void test__CreateEventEx__arg4__notuninit() {
 }
 
 void test__CreateEventExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEventExA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEventExA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11381,8 +11381,8 @@ void test__CreateEventExA__arg4__notuninit() {
 }
 
 void test__CreateEventExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateEventExW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateEventExW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11432,8 +11432,8 @@ void test__CreateEventExW__arg4__notuninit() {
 }
 
 void test__OpenEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenEvent(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenEvent(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11467,8 +11467,8 @@ void test__OpenEvent__arg3__notuninit() {
 }
 
 void test__OpenEventA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenEventA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenEventA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11502,8 +11502,8 @@ void test__OpenEventA__arg3__notuninit() {
 }
 
 void test__OpenEventW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenEventW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenEventW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11537,8 +11537,8 @@ void test__OpenEventW__arg3__notuninit() {
 }
 
 void test__PulseEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else PulseEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; PulseEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11561,8 +11561,8 @@ void test__PulseEvent__arg1__notuninit() {
 }
 
 void test__ResetEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ResetEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; ResetEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11585,8 +11585,8 @@ void test__ResetEvent__arg1__notuninit() {
 }
 
 void test__SetEvent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetEvent(arg1);
+  int x = 1;
+  if (cond) { x=100; SetEvent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11609,8 +11609,8 @@ void test__SetEvent__arg1__notuninit() {
 }
 
 void test__InitializeCriticalSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else InitializeCriticalSection(arg1);
+  int x = 1;
+  if (cond) { x=100; InitializeCriticalSection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11626,8 +11626,8 @@ void test__InitializeCriticalSection__arg1__notnull() {
 }
 
 void test__InitializeCriticalSectionAndSpinCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else InitializeCriticalSectionAndSpinCount(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; InitializeCriticalSectionAndSpinCount(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11654,8 +11654,8 @@ void test__InitializeCriticalSectionAndSpinCount__arg2__notuninit() {
 }
 
 void test__InitializeCriticalSectionEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else InitializeCriticalSectionEx(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; InitializeCriticalSectionEx(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11693,8 +11693,8 @@ void test__InitializeCriticalSectionEx__arg3__notuninit() {
 }
 
 void test__SetCriticalSectionSpinCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetCriticalSectionSpinCount(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; SetCriticalSectionSpinCount(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11727,8 +11727,8 @@ void test__SetCriticalSectionSpinCount__arg2__notuninit() {
 }
 
 void test__DeleteCriticalSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else DeleteCriticalSection(arg1);
+  int x = 1;
+  if (cond) { x=100; DeleteCriticalSection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11750,8 +11750,8 @@ void test__DeleteCriticalSection__arg1__notuninit() {
 }
 
 void test__EnterCriticalSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else EnterCriticalSection(arg1);
+  int x = 1;
+  if (cond) { x=100; EnterCriticalSection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11779,8 +11779,8 @@ void test__EnterCriticalSection__arg1__notuninit() {
 }
 
 void test__TryEnterCriticalSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else TryEnterCriticalSection(arg1);
+  int x = 1;
+  if (cond) { x=100; TryEnterCriticalSection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11808,8 +11808,8 @@ void test__TryEnterCriticalSection__arg1__notuninit() {
 }
 
 void test__LeaveCriticalSection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else LeaveCriticalSection(arg1);
+  int x = 1;
+  if (cond) { x=100; LeaveCriticalSection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11837,8 +11837,8 @@ void test__LeaveCriticalSection__arg1__notuninit() {
 }
 
 void test__lstrcat__noreturn() {
-  int x = 100;
-  if (cond) x=1; else lstrcat(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; lstrcat(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11872,8 +11872,8 @@ void test__lstrcat__arg2__notuninit() {
 }
 
 void test__CreateSemaphore__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphore(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphore(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11908,8 +11908,8 @@ void test__CreateSemaphore__arg4__notuninit() {
 }
 
 void test__CreateSemaphoreA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphoreA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphoreA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11944,8 +11944,8 @@ void test__CreateSemaphoreA__arg4__notuninit() {
 }
 
 void test__CreateSemaphoreW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphoreW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphoreW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -11980,8 +11980,8 @@ void test__CreateSemaphoreW__arg4__notuninit() {
 }
 
 void test__CreateSemaphoreEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphoreEx(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphoreEx(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12028,8 +12028,8 @@ void test__CreateSemaphoreEx__arg6__notuninit() {
 }
 
 void test__CreateSemaphoreExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphoreExA(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphoreExA(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12076,8 +12076,8 @@ void test__CreateSemaphoreExA__arg6__notuninit() {
 }
 
 void test__CreateSemaphoreExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateSemaphoreExW(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; CreateSemaphoreExW(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12124,8 +12124,8 @@ void test__CreateSemaphoreExW__arg6__notuninit() {
 }
 
 void test__OpenSemaphore__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenSemaphore(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenSemaphore(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12159,8 +12159,8 @@ void test__OpenSemaphore__arg3__notuninit() {
 }
 
 void test__OpenSemaphoreA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenSemaphoreA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenSemaphoreA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12194,8 +12194,8 @@ void test__OpenSemaphoreA__arg3__notuninit() {
 }
 
 void test__OpenSemaphoreW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenSemaphoreW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenSemaphoreW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12229,8 +12229,8 @@ void test__OpenSemaphoreW__arg3__notuninit() {
 }
 
 void test__ReleaseSemaphore__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ReleaseSemaphore(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; ReleaseSemaphore(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12269,8 +12269,8 @@ void test__ReleaseSemaphore__arg3__notuninit() {
 }
 
 void test__CreateMutex__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutex(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; CreateMutex(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12304,8 +12304,8 @@ void test__CreateMutex__arg3__notuninit() {
 }
 
 void test__CreateMutexA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutexA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; CreateMutexA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12339,8 +12339,8 @@ void test__CreateMutexA__arg3__notuninit() {
 }
 
 void test__CreateMutexW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutexW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; CreateMutexW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12374,8 +12374,8 @@ void test__CreateMutexW__arg3__notuninit() {
 }
 
 void test__CreateMutexEx__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutexEx(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateMutexEx(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12415,8 +12415,8 @@ void test__CreateMutexEx__arg4__notuninit() {
 }
 
 void test__CreateMutexExA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutexExA(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateMutexExA(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12456,8 +12456,8 @@ void test__CreateMutexExA__arg4__notuninit() {
 }
 
 void test__CreateMutexExW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else CreateMutexExW(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; CreateMutexExW(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12497,8 +12497,8 @@ void test__CreateMutexExW__arg4__notuninit() {
 }
 
 void test__OpenMutex__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenMutex(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenMutex(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12532,8 +12532,8 @@ void test__OpenMutex__arg3__notuninit() {
 }
 
 void test__OpenMutexA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenMutexA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenMutexA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12567,8 +12567,8 @@ void test__OpenMutexA__arg3__notuninit() {
 }
 
 void test__OpenMutexW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else OpenMutexW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; OpenMutexW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12602,8 +12602,8 @@ void test__OpenMutexW__arg3__notuninit() {
 }
 
 void test__ReleaseMutex__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ReleaseMutex(arg1);
+  int x = 1;
+  if (cond) { x=100; ReleaseMutex(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12626,8 +12626,8 @@ void test__ReleaseMutex__arg1__notuninit() {
 }
 
 void test___malloca__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _malloca(arg1);
+  int x = 1;
+  if (cond) { x=100; _malloca(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12639,8 +12639,8 @@ void test___malloca__arg1__notuninit() {
 }
 
 void test___alloca__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _alloca(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _alloca(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12657,8 +12657,8 @@ void test___alloca__arg1__notuninit() {
 }
 
 void test___freea__noreturn() {
-  int x = 100;
-  if (cond) x=1; else _freea(arg1);
+  int x = 1;
+  if (cond) { x=100; _freea(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12670,8 +12670,8 @@ void test___freea__arg1__notuninit() {
 }
 
 void test__strlwr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strlwr(arg1);
+  int x = 1;
+  if (cond) { x=100; strlwr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12688,8 +12688,8 @@ void test__strlwr__arg1__notuninit() {
 }
 
 void test__strupr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else strupr(arg1);
+  int x = 1;
+  if (cond) { x=100; strupr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12706,8 +12706,8 @@ void test__strupr__arg1__notuninit() {
 }
 
 void test__GetLocalTime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetLocalTime(arg1);
+  int x = 1;
+  if (cond) { x=100; GetLocalTime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12724,8 +12724,8 @@ void test__GetLocalTime__arg1__notnull() {
 }
 
 void test__GetSystemTime__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetSystemTime(arg1);
+  int x = 1;
+  if (cond) { x=100; GetSystemTime(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12742,8 +12742,8 @@ void test__GetSystemTime__arg1__notnull() {
 }
 
 void test__GetLastError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetLastError();
+  int x = 1;
+  if (cond) { x=100; result = GetLastError(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12754,8 +12754,8 @@ void test__GetLastError__useretval() {
 }
 
 void test__SetLastError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else SetLastError(arg1);
+  int x = 1;
+  if (cond) { x=100; SetLastError(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12773,8 +12773,8 @@ void test__SetLastError__arg1__notuninit() {
 }
 
 void test__AllocateAndInitializeSid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else AllocateAndInitializeSid(arg1);
+  int x = 1;
+  if (cond) { x=100; AllocateAndInitializeSid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12790,8 +12790,8 @@ void test__AllocateAndInitializeSid__arg1__notnull() {
 }
 
 void test__FreeSid__noreturn() {
-  int x = 100;
-  if (cond) x=1; else FreeSid(arg1);
+  int x = 1;
+  if (cond) { x=100; FreeSid(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12803,8 +12803,8 @@ void test__FreeSid__arg1__notuninit() {
 }
 
 void test__HeapAlloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else HeapAlloc(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; HeapAlloc(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12828,8 +12828,8 @@ void test__HeapAlloc__arg3__notuninit() {
 }
 
 void test__HeapReAlloc__noreturn() {
-  int x = 100;
-  if (cond) x=1; else HeapReAlloc(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; HeapReAlloc(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12864,8 +12864,8 @@ void test__HeapReAlloc__arg4__notuninit() {
 }
 
 void test__HeapFree__noreturn() {
-  int x = 100;
-  if (cond) x=1; else HeapFree(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; HeapFree(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12894,8 +12894,8 @@ void test__HeapFree__arg3__notuninit() {
 }
 
 void test__HeapSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = HeapSize(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; result = HeapSize(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12930,8 +12930,8 @@ void test__HeapSize__arg3__notuninit() {
 }
 
 void test__HeapValidate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else HeapValidate(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; HeapValidate(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12961,8 +12961,8 @@ void test__HeapValidate__arg3__notuninit() {
 }
 
 void test__GetProcessHeap__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = GetProcessHeap();
+  int x = 1;
+  if (cond) { x=100; result = GetProcessHeap(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12973,8 +12973,8 @@ void test__GetProcessHeap__useretval() {
 }
 
 void test__GetUserName__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetUserName(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetUserName(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -12997,8 +12997,8 @@ void test__GetUserName__arg2__notuninit() {
 }
 
 void test__GetUserNameA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetUserNameA(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetUserNameA(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13021,8 +13021,8 @@ void test__GetUserNameA__arg2__notuninit() {
 }
 
 void test__GetUserNameW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetUserNameW(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; GetUserNameW(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13045,8 +13045,8 @@ void test__GetUserNameW__arg2__notuninit() {
 }
 
 void test__GetWindowText__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetWindowText(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetWindowText(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13074,8 +13074,8 @@ void test__GetWindowText__arg3__notuninit() {
 }
 
 void test__GetWindowTextA__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetWindowTextA(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetWindowTextA(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13103,8 +13103,8 @@ void test__GetWindowTextA__arg3__notuninit() {
 }
 
 void test__GetWindowTextW__noreturn() {
-  int x = 100;
-  if (cond) x=1; else GetWindowTextW(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; GetWindowTextW(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13132,8 +13132,8 @@ void test__GetWindowTextW__arg3__notuninit() {
 }
 
 void test__socket__noreturn() {
-  int x = 100;
-  if (cond) x=1; else socket(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; socket(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13157,8 +13157,8 @@ void test__socket__arg3__notuninit() {
 }
 
 void test__closesocket__noreturn() {
-  int x = 100;
-  if (cond) x=1; else closesocket(arg1);
+  int x = 1;
+  if (cond) { x=100; closesocket(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13170,8 +13170,8 @@ void test__closesocket__arg1__notuninit() {
 }
 
 void test__accept__noreturn() {
-  int x = 100;
-  if (cond) x=1; else accept(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; accept(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13201,8 +13201,8 @@ void test__accept__arg3__notuninit() {
 }
 
 void test__bind__noreturn() {
-  int x = 100;
-  if (cond) x=1; else bind(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; bind(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13231,8 +13231,8 @@ void test__bind__arg3__notuninit() {
 }
 
 void test__connect__noreturn() {
-  int x = 100;
-  if (cond) x=1; else connect(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; connect(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13261,8 +13261,8 @@ void test__connect__arg3__notuninit() {
 }
 
 void test__getpeername__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getpeername(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getpeername(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13296,8 +13296,8 @@ void test__getpeername__arg3__notuninit() {
 }
 
 void test__getsockname__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getsockname(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; getsockname(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13331,8 +13331,8 @@ void test__getsockname__arg3__notuninit() {
 }
 
 void test__getsockopt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else getsockopt(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; getsockopt(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13378,8 +13378,8 @@ void test__getsockopt__arg5__notuninit() {
 }
 
 void test__htonl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = htonl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = htonl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13402,8 +13402,8 @@ void test__htonl__arg1__notuninit() {
 }
 
 void test__htons__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = htons(arg1);
+  int x = 1;
+  if (cond) { x=100; result = htons(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13426,8 +13426,8 @@ void test__htons__arg1__notuninit() {
 }
 
 void test__inet_addr__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = inet_addr(arg1);
+  int x = 1;
+  if (cond) { x=100; result = inet_addr(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13455,8 +13455,8 @@ void test__inet_addr__arg1__notuninit() {
 }
 
 void test__inet_ntoa__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = inet_ntoa(arg1);
+  int x = 1;
+  if (cond) { x=100; result = inet_ntoa(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13479,8 +13479,8 @@ void test__inet_ntoa__arg1__notuninit() {
 }
 
 void test__ioctlsocket__noreturn() {
-  int x = 100;
-  if (cond) x=1; else ioctlsocket(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; ioctlsocket(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13509,8 +13509,8 @@ void test__ioctlsocket__arg3__notnull() {
 }
 
 void test__listen__noreturn() {
-  int x = 100;
-  if (cond) x=1; else listen(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; listen(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13534,8 +13534,8 @@ void test__listen__arg2__notuninit() {
 }
 
 void test__ntohl__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ntohl(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ntohl(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13558,8 +13558,8 @@ void test__ntohl__arg1__notuninit() {
 }
 
 void test__ntohs__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = ntohs(arg1);
+  int x = 1;
+  if (cond) { x=100; result = ntohs(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13582,8 +13582,8 @@ void test__ntohs__arg1__notuninit() {
 }
 
 void test__recv__noreturn() {
-  int x = 100;
-  if (cond) x=1; else recv(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; recv(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13618,8 +13618,8 @@ void test__recv__arg4__notuninit() {
 }
 
 void test__recvfrom__noreturn() {
-  int x = 100;
-  if (cond) x=1; else recvfrom(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; recvfrom(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13654,8 +13654,8 @@ void test__recvfrom__arg4__notuninit() {
 }
 
 void test__select__noreturn() {
-  int x = 100;
-  if (cond) x=1; else select(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; select(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13673,8 +13673,8 @@ void test__select__arg5__notuninit() {
 }
 
 void test__send__noreturn() {
-  int x = 100;
-  if (cond) x=1; else send(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; send(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13709,8 +13709,8 @@ void test__send__arg4__notuninit() {
 }
 
 void test__sendto__noreturn() {
-  int x = 100;
-  if (cond) x=1; else sendto(arg1, arg2, arg3, arg4, arg5, arg6);
+  int x = 1;
+  if (cond) { x=100; sendto(arg1, arg2, arg3, arg4, arg5, arg6); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13757,8 +13757,8 @@ void test__sendto__arg6__notuninit() {
 }
 
 void test__setsockopt__noreturn() {
-  int x = 100;
-  if (cond) x=1; else setsockopt(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; setsockopt(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13799,8 +13799,8 @@ void test__setsockopt__arg5__notuninit() {
 }
 
 void test__shutdown__noreturn() {
-  int x = 100;
-  if (cond) x=1; else shutdown(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; shutdown(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13824,8 +13824,8 @@ void test__shutdown__arg2__notuninit() {
 }
 
 void test__WSAStartup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WSAStartup(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; WSAStartup(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13848,15 +13848,15 @@ void test__WSAStartup__arg2__notnull() {
 }
 
 void test__WSACleanup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WSACleanup();
+  int x = 1;
+  if (cond) { x=100; WSACleanup(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
 
 void test__WSAGetLastError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = WSAGetLastError();
+  int x = 1;
+  if (cond) { x=100; result = WSAGetLastError(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13867,8 +13867,8 @@ void test__WSAGetLastError__useretval() {
 }
 
 void test__WSASetLastError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else WSASetLastError(arg1);
+  int x = 1;
+  if (cond) { x=100; WSASetLastError(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13886,8 +13886,8 @@ void test__WSASetLastError__arg1__notuninit() {
 }
 
 void test___fileno__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _fileno(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _fileno(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13920,8 +13920,8 @@ void test___fileno__arg1__notuninit() {
 }
 
 void test___tolower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tolower(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _tolower(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13944,8 +13944,8 @@ void test___tolower__arg1__notuninit() {
 }
 
 void test___tolower_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _tolower_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _tolower_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -13974,8 +13974,8 @@ void test___tolower_l__arg2__notuninit() {
 }
 
 void test___towlower_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _towlower_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _towlower_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14004,8 +14004,8 @@ void test___towlower_l__arg2__notuninit() {
 }
 
 void test___toupper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _toupper(arg1);
+  int x = 1;
+  if (cond) { x=100; result = _toupper(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14028,8 +14028,8 @@ void test___toupper__arg1__notuninit() {
 }
 
 void test___toupper_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _toupper_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _toupper_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14058,8 +14058,8 @@ void test___toupper_l__arg2__notuninit() {
 }
 
 void test___towupper_l__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = _towupper_l(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; result = _towupper_l(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14088,8 +14088,8 @@ void test___towupper_l__arg2__notuninit() {
 }
 
 void test____noop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else __noop();
+  int x = 1;
+  if (cond) { x=100; __noop(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -14101,8 +14101,8 @@ void test____noop__leakignore() {
 }
 
 void test____nop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else __nop();
+  int x = 1;
+  if (cond) { x=100; __nop(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/test/cfg/generated-cfg-tests-wxwidgets.cpp b/test/cfg/generated-cfg-tests-wxwidgets.cpp
index d1b7f3531..5b15303fe 100644
--- a/test/cfg/generated-cfg-tests-wxwidgets.cpp
+++ b/test/cfg/generated-cfg-tests-wxwidgets.cpp
@@ -4,13 +4,13 @@
 // ./generate_cfg_tests cfg/wxwidgets.cfg > generated-cfg-tests-wxwidgets.cpp
 //
 // Recommended cppcheck command line:
-// $ cppcheck --enable=warning,information --inline-suppr generated-cfg-tests-wxwidgets.cpp
+// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 generated-cfg-tests-wxwidgets.cpp
 // => 'unmatched suppression' warnings are false negatives.
 //
 
 void test__wxString__Format__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxString::Format(arg1);
+  int x = 1;
+  if (cond) { x=100; wxString::Format(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -38,8 +38,8 @@ void test__wxString__Format__arg1__notuninit() {
 }
 
 void test__wxString__Printf__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxString::Printf(arg1);
+  int x = 1;
+  if (cond) { x=100; wxString::Printf(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -67,8 +67,8 @@ void test__wxString__Printf__arg1__notuninit() {
 }
 
 void test__wxString__IsEmpty__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::IsEmpty();
+  int x = 1;
+  if (cond) { x=100; result = wxString::IsEmpty(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -85,8 +85,8 @@ void test__wxString__IsEmpty__leakignore() {
 }
 
 void test__wxString__IsNull__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::IsNull();
+  int x = 1;
+  if (cond) { x=100; result = wxString::IsNull(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -103,8 +103,8 @@ void test__wxString__IsNull__leakignore() {
 }
 
 void test__wxString__IsNumber__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::IsNumber();
+  int x = 1;
+  if (cond) { x=100; result = wxString::IsNumber(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -121,8 +121,8 @@ void test__wxString__IsNumber__leakignore() {
 }
 
 void test__wxString__IsAscii__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::IsAscii();
+  int x = 1;
+  if (cond) { x=100; result = wxString::IsAscii(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -139,8 +139,8 @@ void test__wxString__IsAscii__leakignore() {
 }
 
 void test__wxString__IsWord__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::IsWord();
+  int x = 1;
+  if (cond) { x=100; result = wxString::IsWord(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -157,8 +157,8 @@ void test__wxString__IsWord__leakignore() {
 }
 
 void test__wxString__Len__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::Len();
+  int x = 1;
+  if (cond) { x=100; result = wxString::Len(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -175,8 +175,8 @@ void test__wxString__Len__leakignore() {
 }
 
 void test__wxString__length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::length();
+  int x = 1;
+  if (cond) { x=100; result = wxString::length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -193,8 +193,8 @@ void test__wxString__length__leakignore() {
 }
 
 void test__wxString__Length__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::Length();
+  int x = 1;
+  if (cond) { x=100; result = wxString::Length(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -211,8 +211,8 @@ void test__wxString__Length__leakignore() {
 }
 
 void test__wxString__Lower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::Lower();
+  int x = 1;
+  if (cond) { x=100; result = wxString::Lower(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -229,8 +229,8 @@ void test__wxString__Lower__leakignore() {
 }
 
 void test__wxString__MakeCapitalized__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::MakeCapitalized();
+  int x = 1;
+  if (cond) { x=100; result = wxString::MakeCapitalized(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -247,8 +247,8 @@ void test__wxString__MakeCapitalized__leakignore() {
 }
 
 void test__wxString__MakeLower__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::MakeLower();
+  int x = 1;
+  if (cond) { x=100; result = wxString::MakeLower(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -265,8 +265,8 @@ void test__wxString__MakeLower__leakignore() {
 }
 
 void test__wxString__MakeUpper__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::MakeUpper();
+  int x = 1;
+  if (cond) { x=100; result = wxString::MakeUpper(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -283,8 +283,8 @@ void test__wxString__MakeUpper__leakignore() {
 }
 
 void test__wxString__Matches__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxString::Matches(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxString::Matches(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -307,8 +307,8 @@ void test__wxString__Matches__arg1__notuninit() {
 }
 
 void test__wxString__LowerCase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxString::LowerCase();
+  int x = 1;
+  if (cond) { x=100; wxString::LowerCase(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -320,8 +320,8 @@ void test__wxString__LowerCase__leakignore() {
 }
 
 void test__wxSysErrorCode__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSysErrorCode();
+  int x = 1;
+  if (cond) { x=100; result = wxSysErrorCode(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -332,8 +332,8 @@ void test__wxSysErrorCode__useretval() {
 }
 
 void test__wxLogMessage__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogMessage(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogMessage(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -361,8 +361,8 @@ void test__wxLogMessage__arg1__notuninit() {
 }
 
 void test__wxLogVerbose__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogVerbose(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogVerbose(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -390,8 +390,8 @@ void test__wxLogVerbose__arg1__notuninit() {
 }
 
 void test__wxLogWarning__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogWarning(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogWarning(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -419,8 +419,8 @@ void test__wxLogWarning__arg1__notuninit() {
 }
 
 void test__wxLogFatalError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogFatalError(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogFatalError(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -448,8 +448,8 @@ void test__wxLogFatalError__arg1__notuninit() {
 }
 
 void test__wxLogError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogError(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogError(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -477,8 +477,8 @@ void test__wxLogError__arg1__notuninit() {
 }
 
 void test__wxLogTrace__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogTrace(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxLogTrace(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -506,8 +506,8 @@ void test__wxLogTrace__arg2__notuninit() {
 }
 
 void test__wxLogDebug__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogDebug(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogDebug(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -535,8 +535,8 @@ void test__wxLogDebug__arg1__notuninit() {
 }
 
 void test__wxLogSysError__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogSysError(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogSysError(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -564,8 +564,8 @@ void test__wxLogSysError__arg1__notuninit() {
 }
 
 void test__wxLogGeneric__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogGeneric(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxLogGeneric(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -599,8 +599,8 @@ void test__wxLogGeneric__arg2__notuninit() {
 }
 
 void test__wxLogInfo__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLogInfo(arg1);
+  int x = 1;
+  if (cond) { x=100; wxLogInfo(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -628,8 +628,8 @@ void test__wxLogInfo__arg1__notuninit() {
 }
 
 void test__wxSpinCtrl__GetMax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrl::GetMax();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrl::GetMax(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -646,8 +646,8 @@ void test__wxSpinCtrl__GetMax__leakignore() {
 }
 
 void test__wxSpinCtrl__GetMin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrl::GetMin();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrl::GetMin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -664,8 +664,8 @@ void test__wxSpinCtrl__GetMin__leakignore() {
 }
 
 void test__wxSpinCtrl__GetBase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrl::GetBase();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrl::GetBase(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -682,8 +682,8 @@ void test__wxSpinCtrl__GetBase__leakignore() {
 }
 
 void test__wxSpinCtrl__GetValue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrl::GetValue();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrl::GetValue(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -700,8 +700,8 @@ void test__wxSpinCtrl__GetValue__leakignore() {
 }
 
 void test__wxSpinCtrl__SetBase__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSpinCtrl::SetBase(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSpinCtrl::SetBase(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -729,8 +729,8 @@ void test__wxSpinCtrl__SetBase__arg1__notuninit() {
 }
 
 void test__wxSpinCtrlDouble__GetDigits__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrlDouble::GetDigits();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrlDouble::GetDigits(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -747,8 +747,8 @@ void test__wxSpinCtrlDouble__GetDigits__leakignore() {
 }
 
 void test__wxSpinCtrlDouble__GetIncrement__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrlDouble::GetIncrement();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrlDouble::GetIncrement(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -765,8 +765,8 @@ void test__wxSpinCtrlDouble__GetIncrement__leakignore() {
 }
 
 void test__wxSpinCtrlDouble__GetMax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrlDouble::GetMax();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrlDouble::GetMax(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -783,8 +783,8 @@ void test__wxSpinCtrlDouble__GetMax__leakignore() {
 }
 
 void test__wxSpinCtrlDouble__GetMin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrlDouble::GetMin();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrlDouble::GetMin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -801,8 +801,8 @@ void test__wxSpinCtrlDouble__GetMin__leakignore() {
 }
 
 void test__wxSpinCtrlDouble__GetValue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSpinCtrlDouble::GetValue();
+  int x = 1;
+  if (cond) { x=100; result = wxSpinCtrlDouble::GetValue(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -819,8 +819,8 @@ void test__wxSpinCtrlDouble__GetValue__leakignore() {
 }
 
 void test__wxSpinCtrlDouble__SetDigits__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSpinCtrlDouble::SetDigits(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSpinCtrlDouble::SetDigits(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -838,8 +838,8 @@ void test__wxSpinCtrlDouble__SetDigits__arg1__notuninit() {
 }
 
 void test__wxSpinCtrlDouble__SetIncrement__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSpinCtrlDouble::SetIncrement(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSpinCtrlDouble::SetIncrement(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -857,8 +857,8 @@ void test__wxSpinCtrlDouble__SetIncrement__arg1__notuninit() {
 }
 
 void test__wxSpinCtrlDouble__SetRange__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSpinCtrlDouble::SetRange(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxSpinCtrlDouble::SetRange(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -882,8 +882,8 @@ void test__wxSpinCtrlDouble__SetRange__arg2__notuninit() {
 }
 
 void test__wxSpinCtrlDouble__SetValue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSpinCtrlDouble::SetValue(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSpinCtrlDouble::SetValue(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -901,8 +901,8 @@ void test__wxSpinCtrlDouble__SetValue__arg1__notuninit() {
 }
 
 void test__wxSlider__GetLineSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetLineSize();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetLineSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -919,8 +919,8 @@ void test__wxSlider__GetLineSize__leakignore() {
 }
 
 void test__wxSlider__GetMax__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetMax();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetMax(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -937,8 +937,8 @@ void test__wxSlider__GetMax__leakignore() {
 }
 
 void test__wxSlider__GetMin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetMin();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetMin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -955,8 +955,8 @@ void test__wxSlider__GetMin__leakignore() {
 }
 
 void test__wxSlider__GetPageSize__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetPageSize();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetPageSize(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -973,8 +973,8 @@ void test__wxSlider__GetPageSize__leakignore() {
 }
 
 void test__wxSlider__GetSelEnd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetSelEnd();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetSelEnd(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -991,8 +991,8 @@ void test__wxSlider__GetSelEnd__leakignore() {
 }
 
 void test__wxSlider__GetSelStart__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetSelStart();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetSelStart(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1009,8 +1009,8 @@ void test__wxSlider__GetSelStart__leakignore() {
 }
 
 void test__wxSlider__GetThumbLength__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetThumbLength();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetThumbLength(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1027,8 +1027,8 @@ void test__wxSlider__GetThumbLength__leakignore() {
 }
 
 void test__wxSlider__GetTickFreq__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetTickFreq();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetTickFreq(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1045,8 +1045,8 @@ void test__wxSlider__GetTickFreq__leakignore() {
 }
 
 void test__wxSlider__GetValue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxSlider::GetValue();
+  int x = 1;
+  if (cond) { x=100; result = wxSlider::GetValue(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1063,8 +1063,8 @@ void test__wxSlider__GetValue__leakignore() {
 }
 
 void test__wxTimer__GetId__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTimer::GetId();
+  int x = 1;
+  if (cond) { x=100; result = wxTimer::GetId(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1081,8 +1081,8 @@ void test__wxTimer__GetId__leakignore() {
 }
 
 void test__wxTimer__GetInterval__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTimer::GetInterval();
+  int x = 1;
+  if (cond) { x=100; result = wxTimer::GetInterval(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1099,8 +1099,8 @@ void test__wxTimer__GetInterval__leakignore() {
 }
 
 void test__wxTimer__GetOwner__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTimer::GetOwner();
+  int x = 1;
+  if (cond) { x=100; result = wxTimer::GetOwner(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1117,8 +1117,8 @@ void test__wxTimer__GetOwner__leakignore() {
 }
 
 void test__wxTimer__IsOneShot__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTimer::IsOneShot();
+  int x = 1;
+  if (cond) { x=100; result = wxTimer::IsOneShot(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1135,8 +1135,8 @@ void test__wxTimer__IsOneShot__leakignore() {
 }
 
 void test__wxTimer__IsRunning__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTimer::IsRunning();
+  int x = 1;
+  if (cond) { x=100; result = wxTimer::IsRunning(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1153,8 +1153,8 @@ void test__wxTimer__IsRunning__leakignore() {
 }
 
 void test__wxTimer__Notify__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTimer::Notify();
+  int x = 1;
+  if (cond) { x=100; wxTimer::Notify(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1166,8 +1166,8 @@ void test__wxTimer__Notify__leakignore() {
 }
 
 void test__wxTimer__SetOwner__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTimer::SetOwner(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxTimer::SetOwner(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1196,8 +1196,8 @@ void test__wxTimer__SetOwner__arg2__notuninit() {
 }
 
 void test__wxTimer__Start__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTimer::Start(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxTimer::Start(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1221,8 +1221,8 @@ void test__wxTimer__Start__arg2__notuninit() {
 }
 
 void test__wxTimer__StartOnce__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTimer::StartOnce(arg1);
+  int x = 1;
+  if (cond) { x=100; wxTimer::StartOnce(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1240,8 +1240,8 @@ void test__wxTimer__StartOnce__arg1__notuninit() {
 }
 
 void test__wxTimer__Stop__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTimer::Stop();
+  int x = 1;
+  if (cond) { x=100; wxTimer::Stop(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1253,8 +1253,8 @@ void test__wxTimer__Stop__leakignore() {
 }
 
 void test__wxRadioBox__Enable__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::Enable(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::Enable(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1278,8 +1278,8 @@ void test__wxRadioBox__Enable__arg2__notuninit() {
 }
 
 void test__wxRadioBox__FindString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::FindString(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::FindString(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1303,8 +1303,8 @@ void test__wxRadioBox__FindString__arg2__notuninit() {
 }
 
 void test__wxRadioBox__GetColumnCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetColumnCount();
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetColumnCount(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1321,8 +1321,8 @@ void test__wxRadioBox__GetColumnCount__leakignore() {
 }
 
 void test__wxRadioBox__GetItemFromPoint__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetItemFromPoint(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetItemFromPoint(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1345,8 +1345,8 @@ void test__wxRadioBox__GetItemFromPoint__arg1__notuninit() {
 }
 
 void test__wxRadioBox__GetItemHelpText__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetItemHelpText(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetItemHelpText(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1369,8 +1369,8 @@ void test__wxRadioBox__GetItemHelpText__arg1__notuninit() {
 }
 
 void test__wxRadioBox__GetItemToolTip__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetItemToolTip(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetItemToolTip(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1393,8 +1393,8 @@ void test__wxRadioBox__GetItemToolTip__arg1__notuninit() {
 }
 
 void test__wxRadioBox__GetRowCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::GetRowCount();
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::GetRowCount(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1406,8 +1406,8 @@ void test__wxRadioBox__GetRowCount__leakignore() {
 }
 
 void test__wxRadioBox__IsItemEnabled__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::IsItemEnabled(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::IsItemEnabled(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1430,8 +1430,8 @@ void test__wxRadioBox__IsItemEnabled__arg1__notuninit() {
 }
 
 void test__wxRadioBox__IsItemShown__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::IsItemShown(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::IsItemShown(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1454,8 +1454,8 @@ void test__wxRadioBox__IsItemShown__arg1__notuninit() {
 }
 
 void test__wxRadioBox__SetItemHelpText__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::SetItemHelpText(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::SetItemHelpText(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1479,8 +1479,8 @@ void test__wxRadioBox__SetItemHelpText__arg2__notuninit() {
 }
 
 void test__wxRadioBox__SetItemToolTip__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::SetItemToolTip(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::SetItemToolTip(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1504,8 +1504,8 @@ void test__wxRadioBox__SetItemToolTip__arg2__notuninit() {
 }
 
 void test__wxRadioBox__SetSelection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::SetSelection(arg1);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::SetSelection(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1523,8 +1523,8 @@ void test__wxRadioBox__SetSelection__arg1__notuninit() {
 }
 
 void test__wxRadioBox__Show__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::Show(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::Show(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1548,8 +1548,8 @@ void test__wxRadioBox__Show__arg2__notuninit() {
 }
 
 void test__wxRadioBox__GetCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetCount();
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetCount(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1566,8 +1566,8 @@ void test__wxRadioBox__GetCount__leakignore() {
 }
 
 void test__wxRadioBox__GetString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetString(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetString(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1590,8 +1590,8 @@ void test__wxRadioBox__GetString__arg1__notuninit() {
 }
 
 void test__wxRadioBox__SetString__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRadioBox::SetString(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRadioBox::SetString(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1615,8 +1615,8 @@ void test__wxRadioBox__SetString__arg2__notuninit() {
 }
 
 void test__wxRadioBox__GetSelection__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxRadioBox::GetSelection();
+  int x = 1;
+  if (cond) { x=100; result = wxRadioBox::GetSelection(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1633,8 +1633,8 @@ void test__wxRadioBox__GetSelection__leakignore() {
 }
 
 void test__wxButton__GetAuthNeeded__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxButton::GetAuthNeeded();
+  int x = 1;
+  if (cond) { x=100; result = wxButton::GetAuthNeeded(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1651,8 +1651,8 @@ void test__wxButton__GetAuthNeeded__leakignore() {
 }
 
 void test__wxButton__GetLabel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxButton::GetLabel();
+  int x = 1;
+  if (cond) { x=100; result = wxButton::GetLabel(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1669,8 +1669,8 @@ void test__wxButton__GetLabel__leakignore() {
 }
 
 void test__wxButton__SetAuthNeeded__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxButton::SetAuthNeeded(arg1);
+  int x = 1;
+  if (cond) { x=100; wxButton::SetAuthNeeded(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1688,8 +1688,8 @@ void test__wxButton__SetAuthNeeded__arg1__notuninit() {
 }
 
 void test__wxButton__SetDefault__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxButton::SetDefault();
+  int x = 1;
+  if (cond) { x=100; wxButton::SetDefault(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1701,8 +1701,8 @@ void test__wxButton__SetDefault__leakignore() {
 }
 
 void test__wxButton__SetLabel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxButton::SetLabel(arg1);
+  int x = 1;
+  if (cond) { x=100; wxButton::SetLabel(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1720,8 +1720,8 @@ void test__wxButton__SetLabel__arg1__notuninit() {
 }
 
 void test__wxColour__Alpha__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxColour::Alpha();
+  int x = 1;
+  if (cond) { x=100; result = wxColour::Alpha(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1738,8 +1738,8 @@ void test__wxColour__Alpha__leakignore() {
 }
 
 void test__wxColour__Blue__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxColour::Blue();
+  int x = 1;
+  if (cond) { x=100; result = wxColour::Blue(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1756,8 +1756,8 @@ void test__wxColour__Blue__leakignore() {
 }
 
 void test__wxColour__Green__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxColour::Green();
+  int x = 1;
+  if (cond) { x=100; result = wxColour::Green(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1774,8 +1774,8 @@ void test__wxColour__Green__leakignore() {
 }
 
 void test__wxColour__Red__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxColour::Red();
+  int x = 1;
+  if (cond) { x=100; result = wxColour::Red(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1792,8 +1792,8 @@ void test__wxColour__Red__leakignore() {
 }
 
 void test__wxTextFile__AddLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::AddLine(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxTextFile::AddLine(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1817,8 +1817,8 @@ void test__wxTextFile__AddLine__arg2__notuninit() {
 }
 
 void test__wxTextFile__Clear__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::Clear();
+  int x = 1;
+  if (cond) { x=100; wxTextFile::Clear(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1830,8 +1830,8 @@ void test__wxTextFile__Clear__leakignore() {
 }
 
 void test__wxTextFile__Close__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::Close();
+  int x = 1;
+  if (cond) { x=100; wxTextFile::Close(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1843,8 +1843,8 @@ void test__wxTextFile__Close__leakignore() {
 }
 
 void test__wxTextFile__Create__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::Create(arg1);
+  int x = 1;
+  if (cond) { x=100; wxTextFile::Create(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1862,8 +1862,8 @@ void test__wxTextFile__Create__arg1__notuninit() {
 }
 
 void test__wxTextFile__Eof__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::Eof();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::Eof(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1880,8 +1880,8 @@ void test__wxTextFile__Eof__leakignore() {
 }
 
 void test__wxTextFile__Exists__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::Exists();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::Exists(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1898,8 +1898,8 @@ void test__wxTextFile__Exists__leakignore() {
 }
 
 void test__wxTextFile__GetCurrentLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetCurrentLine();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetCurrentLine(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1916,8 +1916,8 @@ void test__wxTextFile__GetCurrentLine__leakignore() {
 }
 
 void test__wxTextFile__GetFirstLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetFirstLine();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetFirstLine(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1934,8 +1934,8 @@ void test__wxTextFile__GetFirstLine__leakignore() {
 }
 
 void test__wxTextFile__GetLastLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetLastLine();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetLastLine(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1952,8 +1952,8 @@ void test__wxTextFile__GetLastLine__leakignore() {
 }
 
 void test__wxTextFile__GetLineCount__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetLineCount();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetLineCount(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1970,8 +1970,8 @@ void test__wxTextFile__GetLineCount__leakignore() {
 }
 
 void test__wxTextFile__GetLineType__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetLineType();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetLineType(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -1988,8 +1988,8 @@ void test__wxTextFile__GetLineType__leakignore() {
 }
 
 void test__wxTextFile__GetName__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetName();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetName(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2006,8 +2006,8 @@ void test__wxTextFile__GetName__leakignore() {
 }
 
 void test__wxTextFile__GetNextLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetNextLine();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetNextLine(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2024,8 +2024,8 @@ void test__wxTextFile__GetNextLine__leakignore() {
 }
 
 void test__wxTextFile__GetPrevLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetPrevLine();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetPrevLine(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2042,8 +2042,8 @@ void test__wxTextFile__GetPrevLine__leakignore() {
 }
 
 void test__wxTextFile__GoToLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::GoToLine(arg1);
+  int x = 1;
+  if (cond) { x=100; wxTextFile::GoToLine(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2061,8 +2061,8 @@ void test__wxTextFile__GoToLine__arg1__notuninit() {
 }
 
 void test__wxTextFile__GuessType__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GuessType();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GuessType(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2079,8 +2079,8 @@ void test__wxTextFile__GuessType__leakignore() {
 }
 
 void test__wxTextFile__InsertLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::InsertLine(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wxTextFile::InsertLine(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2110,8 +2110,8 @@ void test__wxTextFile__InsertLine__arg3__notuninit() {
 }
 
 void test__wxTextFile__IsOpened__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::IsOpened();
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::IsOpened(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2128,8 +2128,8 @@ void test__wxTextFile__IsOpened__leakignore() {
 }
 
 void test__wxTextFile__RemoveLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxTextFile::RemoveLine(arg1);
+  int x = 1;
+  if (cond) { x=100; wxTextFile::RemoveLine(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2147,8 +2147,8 @@ void test__wxTextFile__RemoveLine__arg1__notuninit() {
 }
 
 void test__wxTextFile__GetLine__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxTextFile::GetLine(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxTextFile::GetLine(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2171,8 +2171,8 @@ void test__wxTextFile__GetLine__arg1__notuninit() {
 }
 
 void test__wxSizer__AddSpacer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSizer::AddSpacer(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSizer::AddSpacer(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2190,8 +2190,8 @@ void test__wxSizer__AddSpacer__arg1__notuninit() {
 }
 
 void test__wxBoxSizer__AddSpacer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxBoxSizer::AddSpacer(arg1);
+  int x = 1;
+  if (cond) { x=100; wxBoxSizer::AddSpacer(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2209,8 +2209,8 @@ void test__wxBoxSizer__AddSpacer__arg1__notuninit() {
 }
 
 void test__wxBoxSizer__CalcMin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxBoxSizer::CalcMin();
+  int x = 1;
+  if (cond) { x=100; wxBoxSizer::CalcMin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2222,8 +2222,8 @@ void test__wxBoxSizer__CalcMin__leakignore() {
 }
 
 void test__wxBoxSizer__GetOrientation__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxBoxSizer::GetOrientation();
+  int x = 1;
+  if (cond) { x=100; result = wxBoxSizer::GetOrientation(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2240,8 +2240,8 @@ void test__wxBoxSizer__GetOrientation__leakignore() {
 }
 
 void test__wxBoxSizer__RecalcSizes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxBoxSizer::RecalcSizes();
+  int x = 1;
+  if (cond) { x=100; wxBoxSizer::RecalcSizes(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2253,8 +2253,8 @@ void test__wxBoxSizer__RecalcSizes__leakignore() {
 }
 
 void test__wxBoxSizer__SetOrientation__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxBoxSizer::SetOrientation(arg1);
+  int x = 1;
+  if (cond) { x=100; wxBoxSizer::SetOrientation(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2272,8 +2272,8 @@ void test__wxBoxSizer__SetOrientation__arg1__notuninit() {
 }
 
 void test__wxStaticBoxSizer__CalcMin__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxStaticBoxSizer::CalcMin();
+  int x = 1;
+  if (cond) { x=100; wxStaticBoxSizer::CalcMin(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2285,8 +2285,8 @@ void test__wxStaticBoxSizer__CalcMin__leakignore() {
 }
 
 void test__wxStaticBoxSizer__GetStaticBox__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxStaticBoxSizer::GetStaticBox();
+  int x = 1;
+  if (cond) { x=100; result = wxStaticBoxSizer::GetStaticBox(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2303,8 +2303,8 @@ void test__wxStaticBoxSizer__GetStaticBox__leakignore() {
 }
 
 void test__wxStaticBoxSizer__RecalcSizes__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxStaticBoxSizer::RecalcSizes();
+  int x = 1;
+  if (cond) { x=100; wxStaticBoxSizer::RecalcSizes(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2316,8 +2316,8 @@ void test__wxStaticBoxSizer__RecalcSizes__leakignore() {
 }
 
 void test__wxMenu__Append__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxMenu::Append(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; wxMenu::Append(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2341,8 +2341,8 @@ void test__wxMenu__Append__arg4__notuninit() {
 }
 
 void test__wxLaunchDefaultBrowser__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxLaunchDefaultBrowser(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxLaunchDefaultBrowser(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2366,8 +2366,8 @@ void test__wxLaunchDefaultBrowser__arg2__notuninit() {
 }
 
 void test__wxDirExists__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxDirExists(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxDirExists(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2390,8 +2390,8 @@ void test__wxDirExists__arg1__notuninit() {
 }
 
 void test__wxFileExists__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxFileExists(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxFileExists(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2414,8 +2414,8 @@ void test__wxFileExists__arg1__notuninit() {
 }
 
 void test__wxGetWorkingDirectory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxGetWorkingDirectory(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxGetWorkingDirectory(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2427,8 +2427,8 @@ void test__wxGetWorkingDirectory__arg2__notuninit() {
 }
 
 void test__wxGetCwd__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxGetCwd();
+  int x = 1;
+  if (cond) { x=100; result = wxGetCwd(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2439,8 +2439,8 @@ void test__wxGetCwd__useretval() {
 }
 
 void test__wxSetWorkingDirectory__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSetWorkingDirectory(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSetWorkingDirectory(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2458,8 +2458,8 @@ void test__wxSetWorkingDirectory__arg1__notuninit() {
 }
 
 void test__wxMkdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxMkdir(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxMkdir(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2483,8 +2483,8 @@ void test__wxMkdir__arg2__notuninit() {
 }
 
 void test__wxRmdir__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxRmdir(arg1, arg2);
+  int x = 1;
+  if (cond) { x=100; wxRmdir(arg1, arg2); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2508,8 +2508,8 @@ void test__wxRmdir__arg2__notuninit() {
 }
 
 void test__wxGetTranslation__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxGetTranslation(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; result = wxGetTranslation(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2550,8 +2550,8 @@ void test__wxGetTranslation__arg4__notuninit() {
 }
 
 void test__wxApp__MacOpenFile__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxApp::MacOpenFile(arg1);
+  int x = 1;
+  if (cond) { x=100; wxApp::MacOpenFile(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2569,8 +2569,8 @@ void test__wxApp__MacOpenFile__arg1__notuninit() {
 }
 
 void test__wxArtProvider__Insert__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxArtProvider::Insert(arg1);
+  int x = 1;
+  if (cond) { x=100; wxArtProvider::Insert(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2593,8 +2593,8 @@ void test__wxArtProvider__Insert__arg1__notuninit() {
 }
 
 void test__wxCalendarCtrl__EnableYearChange__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxCalendarCtrl::EnableYearChange(arg1);
+  int x = 1;
+  if (cond) { x=100; wxCalendarCtrl::EnableYearChange(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2612,8 +2612,8 @@ void test__wxCalendarCtrl__EnableYearChange__arg1__notuninit() {
 }
 
 void test__wxComboCtrl__GetTextIndent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxComboCtrl::GetTextIndent();
+  int x = 1;
+  if (cond) { x=100; result = wxComboCtrl::GetTextIndent(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2630,8 +2630,8 @@ void test__wxComboCtrl__GetTextIndent__leakignore() {
 }
 
 void test__wxComboCtrl__HidePopup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxComboCtrl::HidePopup(arg1);
+  int x = 1;
+  if (cond) { x=100; wxComboCtrl::HidePopup(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2649,8 +2649,8 @@ void test__wxComboCtrl__HidePopup__arg1__notuninit() {
 }
 
 void test__wxComboCtrl__ShowPopup__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxComboCtrl::ShowPopup();
+  int x = 1;
+  if (cond) { x=100; wxComboCtrl::ShowPopup(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2662,8 +2662,8 @@ void test__wxComboCtrl__ShowPopup__leakignore() {
 }
 
 void test__wxComboCtrl__SetTextIndent__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxComboCtrl::SetTextIndent(arg1);
+  int x = 1;
+  if (cond) { x=100; wxComboCtrl::SetTextIndent(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2681,8 +2681,8 @@ void test__wxComboCtrl__SetTextIndent__arg1__notuninit() {
 }
 
 void test__wxDataViewCustomRenderer__Activate__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxDataViewCustomRenderer::Activate(arg1, arg2, arg3, arg4);
+  int x = 1;
+  if (cond) { x=100; wxDataViewCustomRenderer::Activate(arg1, arg2, arg3, arg4); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2717,8 +2717,8 @@ void test__wxDataViewCustomRenderer__Activate__arg4__notuninit() {
 }
 
 void test__wxDataViewCustomRenderer__LeftClick__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxDataViewCustomRenderer::LeftClick(arg1, arg2, arg3, arg4, arg5);
+  int x = 1;
+  if (cond) { x=100; wxDataViewCustomRenderer::LeftClick(arg1, arg2, arg3, arg4, arg5); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2759,8 +2759,8 @@ void test__wxDataViewCustomRenderer__LeftClick__arg5__notuninit() {
 }
 
 void test__wxDebugContext__GetLevel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxDebugContext::GetLevel();
+  int x = 1;
+  if (cond) { x=100; result = wxDebugContext::GetLevel(); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2777,8 +2777,8 @@ void test__wxDebugContext__GetLevel__leakignore() {
 }
 
 void test__wxDebugContext__SetLevel__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxDebugContext::SetLevel(arg1);
+  int x = 1;
+  if (cond) { x=100; wxDebugContext::SetLevel(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2796,8 +2796,8 @@ void test__wxDebugContext__SetLevel__arg1__notuninit() {
 }
 
 void test__wxDos2UnixFilename__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxDos2UnixFilename(arg1);
+  int x = 1;
+  if (cond) { x=100; wxDos2UnixFilename(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2820,8 +2820,8 @@ void test__wxDos2UnixFilename__arg1__notuninit() {
 }
 
 void test__wxFileNameFromPath__noreturn() {
-  int x = 100;
-  if (cond) x=1; else result = wxFileNameFromPath(arg1);
+  int x = 1;
+  if (cond) { x=100; result = wxFileNameFromPath(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2844,8 +2844,8 @@ void test__wxFileNameFromPath__arg1__notuninit() {
 }
 
 void test__wxSizerItem__SetWindow__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSizerItem::SetWindow(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSizerItem::SetWindow(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2868,8 +2868,8 @@ void test__wxSizerItem__SetWindow__arg1__notuninit() {
 }
 
 void test__wxSizerItem__SetSizer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSizerItem::SetSizer(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSizerItem::SetSizer(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2892,8 +2892,8 @@ void test__wxSizerItem__SetSizer__arg1__notuninit() {
 }
 
 void test__wxSizerItem__SetSpacer__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxSizerItem::SetSpacer(arg1);
+  int x = 1;
+  if (cond) { x=100; wxSizerItem::SetSpacer(arg1); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2911,8 +2911,8 @@ void test__wxSizerItem__SetSpacer__arg1__notuninit() {
 }
 
 void test__wxGrid__SetCellAlignment__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxGrid::SetCellAlignment(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wxGrid::SetCellAlignment(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
@@ -2942,8 +2942,8 @@ void test__wxGrid__SetCellAlignment__arg3__notuninit() {
 }
 
 void test__wxGrid__SetCellTextColour__noreturn() {
-  int x = 100;
-  if (cond) x=1; else wxGrid::SetCellTextColour(arg1, arg2, arg3);
+  int x = 1;
+  if (cond) { x=100; wxGrid::SetCellTextColour(arg1, arg2, arg3); }
   // cppcheck-suppress shiftTooManyBits
   x = 1 << x;
 }
diff --git a/tools/generate_cfg_tests.cpp b/tools/generate_cfg_tests.cpp
index 32150b3e0..5d4c202cf 100644
--- a/tools/generate_cfg_tests.cpp
+++ b/tools/generate_cfg_tests.cpp
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
     std::cout << "// " << argv[0] << ' ' << cfgfile << " > " << testfile << std::endl;
     std::cout << "//" << std::endl;
     std::cout << "// Recommended cppcheck command line:" << std::endl;
-    std::cout << "// $ cppcheck --enable=warning,information --inline-suppr " << testfile << std::endl;
+    std::cout << "// $ cppcheck --enable=warning,information --inline-suppr --platform=unix64 " << testfile << std::endl;
     std::cout << "// => 'unmatched suppression' warnings are false negatives." << std::endl;
     std::cout << "//" << std::endl << std::endl ;
 
@@ -135,8 +135,8 @@ static void testfunction(const tinyxml2::XMLElement *node, const std::string &fu
 
     if (noreturn) {
         std::cout << "void test__" << replaceCharInString(functionName,':','_') << "__noreturn() {" << std::endl;
-        std::cout << "  int x = 100;" << std::endl;
-        std::cout << "  if (cond) x=1; else " << functionCall(functionName, useretval, -1, numberOfArgs, "") << ';' << std::endl;
+        std::cout << "  int x = 1;" << std::endl;
+        std::cout << "  if (cond) { x=100; " << functionCall(functionName, useretval, -1, numberOfArgs, "") << "; }" << std::endl;
         std::cout << "  // cppcheck-suppress shiftTooManyBits" << std::endl;
         std::cout << "  x = 1 << x;" << std::endl;
         std::cout << "}" << std::endl << std::endl;