diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
index ecf03b66..9c8c59be 100644
--- a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
@@ -310,11 +310,10 @@ void BaseProcMgr::calc() {
         for (auto& proc : mProcUpdateStateList)
             proc.processStateUpdate(mCounter);
 
-        for (auto it = mProcUpdateStateList.robustBegin(), end = mProcUpdateStateList.robustEnd();
-             it != end; ++it) {
-            it->afterUpdateState_();
-            if (it->mStateFlags.isZero()) {
-                mProcUpdateStateList.erase(std::addressof(*it));
+        for (auto& proc : mProcUpdateStateList.robustRange()) {
+            proc.afterUpdateState_();
+            if (proc.mStateFlags.isZero()) {
+                mProcUpdateStateList.erase(&proc);
             }
         }
 
diff --git a/src/KingSystem/Resource/resResourceMgrTask.cpp b/src/KingSystem/Resource/resResourceMgrTask.cpp
index bda7572e..dc66c94c 100644
--- a/src/KingSystem/Resource/resResourceMgrTask.cpp
+++ b/src/KingSystem/Resource/resResourceMgrTask.cpp
@@ -644,9 +644,9 @@ void ResourceMgrTask::clearUnits_() {
     if (num_units != 0 && returnFalse())
         stubbedLogFunction();
 
-    for (auto it = mUnits.robustBegin(), end = mUnits.robustEnd(); it != end; ++it) {
-        ResourceUnit* unit = &*it;
-        if (it->mTask3.canSubmitRequest()) {
+    for (auto& unit_ref : mUnits.robustRange()) {
+        ResourceUnit* unit = &unit_ref;
+        if (unit->mTask3.canSubmitRequest()) {
             mUnits.erase(unit);
             requestClearCache(&unit);
         }
diff --git a/src/KingSystem/System/OverlayArena.cpp b/src/KingSystem/System/OverlayArena.cpp
index 62ae8a8c..271c922d 100644
--- a/src/KingSystem/System/OverlayArena.cpp
+++ b/src/KingSystem/System/OverlayArena.cpp
@@ -73,8 +73,8 @@ void OverlayArena::clearUnits() {
 
     res::stubbedLogFunction();
     auto lock = sead::makeScopedLock(mCS);
-    for (auto it = mUnits.robustBegin(), end = mUnits.robustEnd(); it != end; ++it) {
-        res::ResourceUnit* unit = std::addressof(*it);
+    for (auto& unit_ref : mUnits.robustRange()) {
+        res::ResourceUnit* unit = &unit_ref;
         res::stubbedLogFunction();
         res::ResourceMgrTask::instance()->deregisterUnit(unit);
         res::ResourceMgrTask::instance()->requestClearCacheForSync(&unit, true, false);
diff --git a/src/KingSystem/Utils/Thread/TaskQueueBase.cpp b/src/KingSystem/Utils/Thread/TaskQueueBase.cpp
index 0e8853c8..5310726c 100644
--- a/src/KingSystem/Utils/Thread/TaskQueueBase.cpp
+++ b/src/KingSystem/Utils/Thread/TaskQueueBase.cpp
@@ -31,9 +31,9 @@ void TaskQueueBase::clear() {
     lock();
 
     // Clear all tasks.
-    for (auto it = mActiveTasks.robustBegin(), end = mActiveTasks.robustEnd(); it != end; ++it) {
-        mActiveTasks.erase(std::addressof(*it));
-        it->onRemove();
+    for (auto& task : mActiveTasks.robustRange()) {
+        mActiveTasks.erase(&task);
+        task.onRemove();
     }
     mActiveTasks.clear();