diff --git a/docs/dev/clang-tidy-fixes-2026-04.md b/docs/dev/clang-tidy-fixes-2026-04.md
index ec3b7d09..39358f82 100644
--- a/docs/dev/clang-tidy-fixes-2026-04.md
+++ b/docs/dev/clang-tidy-fixes-2026-04.md
@@ -9,7 +9,7 @@
    - [ ] bugprone-multi-level-implicit-pointer-conversion (4)
    - [ ] bugprone-narrowing-conversions (34)
    - [x] [bugprone-random-generator-seed](https://github.com/Framework-R-D/phlex/pull/490) (1)
-   - [ ] bugprone-reserved-identifier (1)
+   - [x] [bugprone-reserved-identifier](https://github.com/Framework-R-D/phlex/pull/489) (1)
    - [ ] bugprone-return-const-ref-from-parameter (163)
    - [ ] bugprone-throwing-static-initialization (11)
    - [ ] bugprone-unchecked-optional-access (15)
diff --git a/phlex/core/index_router.cpp b/phlex/core/index_router.cpp
index 7d81abb0..82173149 100644
--- a/phlex/core/index_router.cpp
+++ b/phlex/core/index_router.cpp
@@ -216,8 +216,8 @@ namespace phlex::experimental {
       return matched_flushing_entries_.find(layer_hash)->second;
     }
 
-    auto [routing_it, _] = matched_routing_entries_.try_emplace(layer_hash);
-    auto [flushing_it, __] = matched_flushing_entries_.try_emplace(layer_hash);
+    auto routing_it = matched_routing_entries_.try_emplace(layer_hash).first;
+    auto flushing_it = matched_flushing_entries_.try_emplace(layer_hash).first;
 
     auto const layer_path = index->layer_path();