diff --git a/src/DataTree.cc b/src/DataTree.cc
index acfd28aae5123167a11c5f07fb91c739344f343e..72ab5a44b9d1cf63a32d83b9c994c9ff5d763a95 100644
--- a/src/DataTree.cc
+++ b/src/DataTree.cc
@@ -860,10 +860,10 @@ bool
 DataTree::isUnaryOpUsedOnType(SymbolType type, UnaryOpcode opcode) const
 {
   set<int> var;
-  for (const auto& it : unary_op_node_map)
-    if (get<1>(it.first) == opcode)
+  for (const auto& [key, value] : unary_op_node_map)
+    if (get<1>(key) == opcode)
       {
-        it.second->collectVariables(type, var);
+        value->collectVariables(type, var);
         if (!var.empty())
           return true;
       }
@@ -881,10 +881,10 @@ bool
 DataTree::isBinaryOpUsedOnType(SymbolType type, BinaryOpcode opcode) const
 {
   set<int> var;
-  for (const auto& it : binary_op_node_map)
-    if (get<2>(it.first) == opcode)
+  for (const auto& [key, value] : binary_op_node_map)
+    if (get<2>(key) == opcode)
       {
-        it.second->collectVariables(type, var);
+        value->collectVariables(type, var);
         if (!var.empty())
           return true;
       }
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 9f8e5af1aacd0a6dd32e3efe54a23612829a1b17..8bc2da7449a24c66645502162697b68e01355a2c 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -3751,18 +3751,18 @@ void
 DynamicModel::detrendEquations()
 {
   // We go backwards in the list of trend_vars, to deal correctly with I(2) processes
-  for (const auto& it : std::ranges::reverse_view(nonstationary_symbols_map))
+  for (const auto& [symb_id, deflator] : std::ranges::reverse_view(nonstationary_symbols_map))
     {
       for (auto& equation : equations)
         {
           equation = dynamic_cast<BinaryOpNode*>(
-              equation->detrend(it.first, it.second.first, it.second.second));
+              equation->detrend(symb_id, deflator.first, deflator.second));
           assert(equation);
         }
       for (auto& equation : static_only_equations)
         {
           equation = dynamic_cast<BinaryOpNode*>(
-              equation->detrend(it.first, it.second.first, it.second.second));
+              equation->detrend(symb_id, deflator.first, deflator.second));
           assert(equation);
         }
     }
diff --git a/src/ModelEquationBlock.cc b/src/ModelEquationBlock.cc
index a2cd70708297dc5e727fc2cda0829b6440e800bd..647d0180a315c53f4ea9a1441908e9ba6fded13b 100644
--- a/src/ModelEquationBlock.cc
+++ b/src/ModelEquationBlock.cc
@@ -410,10 +410,10 @@ void
 Epilogue::detrend(const map<int, expr_t>& trend_symbols_map,
                   const nonstationary_symbols_map_t& nonstationary_symbols_map)
 {
-  for (const auto& it : ranges::reverse_view(nonstationary_symbols_map))
+  for (const auto& [symb_id, deflator] : ranges::reverse_view(nonstationary_symbols_map))
     for (auto& [symb_id, expr] : dynamic_def_table)
       {
-        expr = expr->detrend(it.first, it.second.first, it.second.second);
+        expr = expr->detrend(symb_id, deflator.first, deflator.second);
         assert(expr);
       }