diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
index 7a432831ad..5874de96c4 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -26,19 +26,19 @@ _aceTimeSecond = floor ACE_time;
 
     _bulletSpeed = vectorMagnitude _bulletVelocity;
 
-    if (!alive _bullet || _bulletSpeed < 100) exitWith {
-        GVAR(allBullets) deleteAt (_forEachIndex - _deleted);
-        _deleted = _deleted + 1;
+    if (!alive _bullet || _bulletSpeed < 100) then {
+        GVAR(allBullets) deleteAt (GVAR(allBullets) find _x);
+    } else {
+        _bulletPosition = getPosASL _bullet;
+
+        if (_bulletTraceVisible && _bulletSpeed > 500) then {
+            drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
+        };
+
+        call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
     };
-
-    _bulletPosition = getPosASL _bullet;
-
-    if (_bulletTraceVisible && _bulletSpeed > 500) then {
-        drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
-    };
-
-    call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
-} forEach GVAR(allBullets);
+    nil
+} count +GVAR(allBullets);
 
 if (GVAR(allBullets) isEqualTo []) then {
     [_this select 1] call CBA_fnc_removePerFrameHandler;
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index cf989fd8b5..0ca9f51329 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -29,17 +29,16 @@
     GVAR(nextFrameNo) = diag_frameno + 1;
 
     //Handle the waitUntilAndExec array:
-    private _deleted = 0;
     {
         // if condition is satisifed call statement
         if ((_x select 2) call (_x select 0)) then {
             // make sure to delete the correct handle when multiple conditions are met in one frame
-            GVAR(waitUntilAndExecArray) deleteAt (_forEachIndex - _deleted);
-            _deleted = _deleted + 1;
+            GVAR(waitUntilAndExecArray) deleteAt (GVAR(waitUntilAndExecArray) find _x);
             (_x select 2) call (_x select 1);
         };
-    } forEach GVAR(waitUntilAndExecArray);
-    
+        nil
+    } count +GVAR(waitUntilAndExecArray);
+
     END_COUNTER(waitAndExec);
 }, 0, []] call CBA_fnc_addPerFrameHandler;
 
diff --git a/addons/common/functions/fnc_setVariablePublic.sqf b/addons/common/functions/fnc_setVariablePublic.sqf
index 67dbd5fd2f..8dbaeffbd6 100644
--- a/addons/common/functions/fnc_setVariablePublic.sqf
+++ b/addons/common/functions/fnc_setVariablePublic.sqf
@@ -38,19 +38,16 @@ GVAR(setVariablePublicArray) pushBack [_object, _varName, _syncTime, _idName];
 if (isNil QGVAR(setVariablePublicPFH)) exitWith {};
 
 GVAR(setVariablePublicPFH) = [{
-    private "_delete";
-    _delete = 0;
-
     {
         _x params ["_object", "_varName", "_syncTime", "_idName"];
         if (ACE_diagTime > _syncTime) then {
             // set value public
             _object setVariable [_varName, _object getVariable _varName, true];
-            GVAR(setVariablePublicArray) deleteAt _forEachIndex - _delete;
-            GVAR(setVariableNames) deleteAt _forEachIndex - _delete;
-            _delete = _delete + 1;
+            GVAR(setVariablePublicArray) deleteAt (GVAR(setVariablePublicArray) find _x);
+            GVAR(setVariableNames) deleteAt (GVAR(setVariableNames) find _x);
         };
-    } forEach GVAR(setVariablePublicArray);
+        nil
+    } count +GVAR(setVariablePublicArray);
 
     if (GVAR(setVariablePublicArray) isEqualTo []) then {
         [GVAR(setVariablePublicPFH)] call CBA_fnc_removePerFrameHandler;
diff --git a/addons/winddeflection/functions/fnc_updateTrajectoryPFH.sqf b/addons/winddeflection/functions/fnc_updateTrajectoryPFH.sqf
index baff39516d..393a5cd757 100644
--- a/addons/winddeflection/functions/fnc_updateTrajectoryPFH.sqf
+++ b/addons/winddeflection/functions/fnc_updateTrajectoryPFH.sqf
@@ -34,8 +34,7 @@
         _bulletSpeed = vectorMagnitude _bulletVelocity;
 
         if ((!alive _bullet) || {(_bullet isKindOf "BulletBase") && {_bulletSpeed < 100}}) then {
-            GVAR(trackedBullets) deleteAt (_forEachIndex - _deleted);
-            _deleted = _deleted + 1;
+            GVAR(trackedBullets) deleteAt (GVAR(trackedBullets) find _x);
         } else {
             if (_isWind) then {
                 _trueVelocity = _bulletVelocity vectorDiff ACE_wind;
@@ -51,7 +50,7 @@
             };
             _bullet setVelocity _bulletVelocity;
         };
-
-    } forEach GVAR(trackedBullets);
+        nil
+    } count +GVAR(trackedBullets);
     // END_COUNTER(pfeh);
 }, GVAR(simulationInterval), [ACE_time]] call CBA_fnc_addPerFrameHandler;