diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index fea0526eb5d..09abde664c1 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -488,7 +488,7 @@ struct ForwardTraversal {
             if (allAnalysis.isIncremental())
                 return Break(Analyzer::Terminate::Bail);
         } else if (allAnalysis.isModified()) {
-            std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, allAnalysis.isModified());
+            std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, /*isModified*/ true);
             bool forkContinue = true;
             for (ForwardTraversal& ft : ftv) {
                 if (condTok)
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 31077d831f5..e913a92d0c5 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -912,7 +912,7 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             }
             compileBinOp(tok, state, compileScope);
         } else if (tok->str() == "[") {
-            if (state.cpp && isPrefixUnary(tok, state.cpp) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
+            if (state.cpp && isPrefixUnary(tok, /*cpp*/ true) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
                 // What we do here:
                 // - Nest the round bracket under the square bracket.
                 // - Nest what follows the lambda (if anything) with the lambda opening [