diff --git a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
index fc2355dc56..39909cf99e 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -111,11 +111,8 @@ bool Foam::loopControl::checkConverged() const
         const fvMesh& regionMesh = *(meshIter.val());
 
         const dictionary& solverDict = regionMesh.solverPerformanceDict();
-
-        forAllConstIters(solverDict, iter)
+        for (const entry& dataDictEntry : solverDict)
         {
-            const entry& dataDictEntry = *iter;
-
             const word& variableName = dataDictEntry.keyword();
 
             const scalar absTol =
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
index aa4d3d6bcb..91c237ac8b 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,10 +73,8 @@ bool Foam::pimpleControl::criteriaSatisfied()
     bool checked = false;    // safety that some checks were indeed performed
 
     const dictionary& solverDict = mesh_.solverPerformanceDict();
-    forAllConstIters(solverDict, iter)
+    for (const entry& solverPerfDictEntry : solverDict)
     {
-        const entry& solverPerfDictEntry = *iter;
-
         const word& fieldName = solverPerfDictEntry.keyword();
         const label fieldi = applyToField(fieldName);
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
index 06b72f25a0..325bc79f88 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -57,10 +57,8 @@ bool Foam::simpleControl::criteriaSatisfied()
     bool checked = false;    // safety that some checks were indeed performed
 
     const dictionary& solverDict = mesh_.solverPerformanceDict();
-    forAllConstIters(solverDict, iter)
+    for (const entry& solverPerfDictEntry : solverDict)
     {
-        const entry& solverPerfDictEntry = *iter;
-
         const word& fieldName = solverPerfDictEntry.keyword();
         const label fieldi = applyToField(fieldName);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index 1c36d90d81..7578c6ced5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -236,19 +236,18 @@ electrostaticDepositionFvPatchScalarField
         sigmas_.setSize(phasesDict_.size());
 
         label phasei = 0;
-        forAllConstIters(phasesDict_, iter)
+        for (const entry& dEntry : phasesDict_)
         {
-            const word& key = iter().keyword();
+            const word& key = dEntry.keyword();
 
-            if (!phasesDict_.isDict(key))
+            if (!dEntry.isDict())
             {
-                FatalErrorInFunction
-                    << "Found non-dictionary entry " << iter()
-                    << " in top-level dictionary " << phasesDict_
-                    << exit(FatalError);
+                FatalIOErrorInFunction(phasesDict_)
+                    << "Entry " << key << " is not a dictionary" << nl
+                    << exit(FatalIOError);
             }
 
-            const dictionary& subDict = phasesDict_.subDict(key);
+            const dictionary& subDict = dEntry.dict();
 
             phaseNames_[phasei] = key;
 
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 92d6b8913d..e0a37bd0cb 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -243,19 +243,18 @@ bool Foam::functionObjects::electricPotential::read(const dictionary& dict)
             }
 
             label phasei = 0;
-            forAllConstIters(phasesDict_, iter)
+            for (const entry& dEntry : phasesDict_)
             {
-                const word& key = iter().keyword();
+                const word& key = dEntry.keyword();
 
-                if (!phasesDict_.isDict(key))
+                if (!dEntry.isDict())
                 {
-                    FatalErrorInFunction
-                        << "Found non-dictionary entry " << iter()
-                        << " in top-level dictionary " << phasesDict_
-                        << exit(FatalError);
+                    FatalIOErrorInFunction(phasesDict_)
+                        << "Entry " << key << " is not a dictionary" << nl
+                        << exit(FatalIOError);
                 }
 
-                const dictionary& subDict = phasesDict_.subDict(key);
+                const dictionary& subDict = dEntry.dict();
 
                 phaseNames_[phasei] = key;
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index d2f89372d0..5017e3b22c 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -1982,7 +1982,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
 //                }
 //            }
 //
-//            forAllConstIter(Map<labelList>, cellToFaces, iter)
+//            forAllConstIters(cellToFaces, iter)
 //            {
 //                if (iter().size() == 2)
 //                {