diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index dee14bf07..c422b84a1 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1959,7 +1959,8 @@ bool Tokenizer::tokenize(std::istream &code,
     // Remove redundant parentheses
     simplifyRedundantParentheses();
     for (Token *tok = list.front(); tok; tok = tok->next())
-        while (TemplateSimplifier::simplifyNumericCalculations(tok));
+        while (TemplateSimplifier::simplifyNumericCalculations(tok))
+            ;
 
     // Handle templates..
     simplifyTemplates();
@@ -2171,7 +2172,8 @@ bool Tokenizer::tokenizeCondition(const std::string &code)
     for (Token *tok = list.front();
          tok;
          tok = tok->next())
-        while (TemplateSimplifier::simplifyNumericCalculations(tok));
+        while (TemplateSimplifier::simplifyNumericCalculations(tok))
+            ;
 
     while (simplifyLogicalOperators()) { }