From 0c893278c34b2aa9dd5ee6a8502fb94b5b9412c8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 30 Oct 2017 09:44:31 +0100
Subject: [PATCH] STYLE: update iterator looping

- use range-for when iterating over HashSet

- prefer forAllIters(), forAllConstIters() with automatic decltype
---
 .../cartesianMeshExtractorPolyMesh.C          |  5 +-
 .../boundaryLayers/boundaryLayerCells.C       | 25 ++---
 .../boundaryLayers/boundaryLayers.C           | 15 ++-
 .../boundaryLayersFacesAndCells.C             |  7 +-
 .../boundaryLayers/boundaryLayersI.H          | 18 ++--
 .../detectBoundaryLayersFunctions.C           |  9 +-
 .../extrudeLayer/extrudeLayer.C               | 23 ++---
 .../refineBoundaryLayers.C                    |  7 +-
 .../utilities/checkMeshDict/checkMeshDict.C   | 17 +---
 .../helperFunctionsFrontalMarking.C           |  8 +-
 .../helperFunctionsGeometryQueriesI.H         | 32 +++----
 .../helperFunctions/helperFunctionsPar.C      | 25 +++--
 .../findCellsIntersectingSurface.C            | 30 +++---
 .../meshes/partTetMesh/partTetMesh.C          |  4 +-
 .../partTetMeshParallelAddressing.C           | 14 +--
 .../meshes/partTriMesh/partTriMesh.C          |  2 +-
 .../partTriMesh/partTriMeshAddressing.C       | 10 +-
 .../partTriMeshParallelAddressing.C           | 29 ++----
 .../meshes/polyMeshGen/polyMeshGenCells.C     | 13 +--
 .../meshes/polyMeshGen/polyMeshGenCellsI.H    | 37 ++------
 .../meshes/polyMeshGen/polyMeshGenFaces.C     | 13 +--
 .../meshes/polyMeshGen/polyMeshGenFacesI.H    | 33 +------
 .../meshes/polyMeshGen/polyMeshGenPoints.C    |  9 +-
 .../meshes/polyMeshGen/polyMeshGenPointsI.H   | 25 +----
 .../polyMeshGenAddressingParallelAddressing.C | 12 +--
 .../polyMeshGenModifierAddBufferCells.C       | 10 +-
 .../primitives/meshSubsets/meshSubsetI.H      | 28 +++---
 .../utilities/meshes/triSurf/triSurf.C        | 11 +--
 .../meshes/triSurf/triSurfAddressing.C        |  7 +-
 .../utilities/meshes/triSurf/triSurfFacets.C  |  4 +-
 .../utilities/meshes/triSurf/triSurfFacetsI.H | 21 +----
 .../meshes/triSurf/triSurfFeatureEdges.C      |  4 +-
 .../meshes/triSurf/triSurfFeatureEdgesI.H     | 21 +----
 .../utilities/meshes/triSurf/triSurfPoints.C  |  4 +-
 .../utilities/meshes/triSurf/triSurfPointsI.H | 21 +----
 .../meshOctreeAddressing.C                    |  6 +-
 .../meshOctreeAddressingCreation.C            | 18 ++--
 .../meshOctreeAddressingGluedMesh.C           |  3 +-
 ...meshOctreeAddressingIrregularConnections.C |  4 +-
 .../meshOctreeAddressingParallelAddressing.C  |  5 +-
 .../meshOctreeInsideOutside.C                 | 30 ++----
 .../meshOctreeModifierLoadDistribution.C      | 21 ++---
 .../meshOctreeModifierParallelRefinement.C    |  3 +-
 .../meshOctreeModifierRefineSelectedBoxes.C   |  2 +-
 .../boundaryLayerOptimisationNormals.C        | 20 ++--
 .../boundaryLayerOptimisationThickness.C      |  2 +-
 .../geometry/meshOptimizer/meshOptimizer.C    | 12 ++-
 .../geometry/meshOptimizer/optimizeMeshFV.C   | 38 +++++---
 .../symmetryPlaneOptimisation.C               | 12 ++-
 .../tetMeshOptimisationParallel.C             | 12 +--
 .../meshSurfaceOptimizer.C                    | 14 ++-
 .../meshSurfaceOptimizerI.H                   |  4 +-
 .../meshSurfaceOptimizerOptimizeSurface.C     | 14 ++-
 .../checkBoundaryFacesSharingTwoEdges.C       |  4 +-
 ...heckIrregularSurfaceConnectionsFunctions.C | 89 ++++++------------
 .../checkNonMappableCellConnections.C         |  6 +-
 ...orrectEdgesBetweenPatchesDistributeFaces.C | 24 +++--
 .../edgeExtractor/edgeExtractor.C             | 22 ++---
 .../edgeExtractor/edgeExtractorCorners.C      | 92 ++++++++-----------
 .../meshSurfaceCheckEdgeTypes.C               | 10 +-
 .../meshSurfaceCheckInvertedVertices.C        | 24 ++---
 ...faceEngineCalculateBoundaryNodesAndFaces.C | 11 +--
 .../meshSurfaceEngineModifier.C               | 10 +-
 .../meshSurfaceEngineParallelAddressing.C     | 20 ++--
 .../meshSurfaceMapperCornersAndEdges.C        | 12 ++-
 .../meshSurfaceMapperPremapVertices.C         |  2 +-
 .../meshSurfaceMapper2D/meshSurfaceMapper2D.C |  2 +-
 .../meshSurfacePartitionerFunctions.C         |  8 +-
 .../triSurfaceCleanupDuplicatesFunctions.C    | 19 ++--
 .../triSurfaceCurvatureEstimatorCalculate.C   | 38 ++++----
 .../triSurfacePartitioner.C                   | 15 +--
 .../triSurfacePatchManipulator.C              |  6 +-
 .../workflowControls/workflowControls.C       |  7 +-
 .../testBndLayerSmoothing.C                   | 10 +-
 74 files changed, 487 insertions(+), 717 deletions(-)

diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
index 38f902f..361d0a9 100644
--- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
+++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
@@ -154,8 +154,7 @@ void cartesianMeshExtractor::createPolyMesh()
         label nProcBoundaries(nFaces), patchI(0);
 
         // allocate memory for processor patches
-        std::map<label, labelLongList>::const_iterator iter;
-        for (iter = procFaces.begin(); iter!=procFaces.end(); ++iter)
+        forAllConstIters(procFaces, iter)
         {
             const label procI = iter->first;
 
@@ -182,7 +181,7 @@ void cartesianMeshExtractor::createPolyMesh()
         // create processor faces
         // they need to be created here because of the correct ordering
         patchI = 0;
-        for (iter = procFaces.begin(); iter!=procFaces.end(); ++iter)
+        forAllConstIters(procFaces, iter)
         {
             procBoundaries[patchI].patchStart() = nProcBoundaries;
 
diff --git a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayerCells.C b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayerCells.C
index eb767f8..19b1ff1 100644
--- a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayerCells.C
+++ b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayerCells.C
@@ -203,12 +203,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         const Map<label>& globalToLocal = mse.globalToLocalBndPointAddressing();
         const labelList& bPoints = mse.boundaryPoints();
 
-        for
-        (
-            Map<label>::const_iterator iter = globalToLocal.begin();
-            iter!=globalToLocal.end();
-            ++iter
-        )
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
             procPoint[bPoints[bpI]] = true;
@@ -376,8 +371,6 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // create cells for corner nodes
-    typedef std::map<std::pair<label, label>, label> mPairToLabelType;
-    typedef std::map<label, mPairToLabelType> mPointsType;
     typedef std::map<label, DynList<label, 3>> ppType;
 
     ppType nodePatches;
@@ -397,7 +390,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         ppfType parPointFaces;
         ppType parPointPatches;
 
-        forAllConstIter(mPointsType, otherVrts_, iter)
+        forAllConstIters(otherVrts_, iter)
         {
             // skip points on feature edges
             if (iter->second.size() == 2)
@@ -504,7 +497,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         }
 
         // sort faces sharing corners at the parallel boundaries
-        forAllIter(ppfType, parPointFaces, iter)
+        forAllIters(parPointFaces, iter)
         {
             DynList<DynList<label, 8>, 8>& pFaces = iter->second;
             DynList<label, 3>& fPatches = parPointPatches[iter->first];
@@ -545,7 +538,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // sort out point which are not at inter-processor boundaries
-    forAllConstIter(mPointsType, otherVrts_, iter)
+    forAllConstIters(otherVrts_, iter)
     {
         if (iter->second.size() == 2)
         {
@@ -598,7 +591,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // create layer cells for corner nodes
-    forAllIter(ppType, nodePatches, iter)
+    forAllIters(nodePatches, iter)
     {
         const DynList<label, 3>& patchIDs = iter->second;
         DynList<label, 3> pKeys;
@@ -812,13 +805,7 @@ void boundaryLayers::createNewFacesFromPointsParallel
     help::exchangeMap(exchangeData, receivedMap);
     exchangeData.clear();
 
-    for
-    (
-        std::map<label, List<labelledPair>>::const_iterator
-        iter = receivedMap.begin();
-        iter!=receivedMap.end();
-        ++iter
-    )
+    forAllConstIters(receivedMap, iter)
     {
         const List<labelledPair>& receivedData = iter->second;
 
diff --git a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C
index 39fd33f..7029f31 100644
--- a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C
+++ b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C
@@ -97,10 +97,8 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
     // patches must be treated together if there exist a corner where
     // more than three patches meet
     const labelHashSet& corners = mPart.corners();
-    forAllConstIter(labelHashSet, corners, it)
+    for (const label bpI : corners)
     {
-        const label bpI = it.key();
-
         if (mPart.numberOfFeatureEdgesAtPoint(bpI) > 3)
         {
             labelHashSet commonPatches;
@@ -227,7 +225,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
         }
 
         // store faces for sending
-        forAllConstIter(Map<label>, otherFaceProc, it)
+        forAllConstIters(otherFaceProc, it)
         {
             const label beI = it.key();
 
@@ -359,8 +357,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
         mesh_.points().setSize(nPoints_);
     }
 
-    std::map<std::pair<label, label>, Pair<label>>::const_iterator it;
-    for (it = edgeClassification.begin(); it!=edgeClassification.end(); ++it)
+    forAllConstIters(edgeClassification, it)
     {
         const std::pair<label, label>& edgePair = it->first;
         const Pair<label>& nConvexAndConcave = it->second;
@@ -481,12 +478,12 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
             }
         }
 
-        forAllConstIter(std::set<label>, commonPatches, it)
+        forAllConstIters(commonPatches, it)
         {
             const label patchJ = *it;
 
             treatPatchesWithPatch_[patchJ].clear();
-            forAllConstIter(std::set<label>, commonPatches, iter)
+            forAllConstIters(commonPatches, iter)
             {
                 treatPatchesWithPatch_[patchJ].append(*iter);
             }
@@ -494,7 +491,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
     }
 
     # ifdef DEBUGLayer
-    for (it = edgeClassification.begin(); it!=edgeClassification.end(); ++it)
+    forAllConstIters(edgeClassification, it)
     {
         const std::pair<label, label>& edgePair = it->first;
         const Pair<label>& nConvexAndConcave = it->second;
diff --git a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersFacesAndCells.C b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersFacesAndCells.C
index 07d5ed2..65163a2 100644
--- a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersFacesAndCells.C
+++ b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersFacesAndCells.C
@@ -212,12 +212,7 @@ void boundaryLayers::createNewFacesParallel
 
     label nTreatedEdges(0);
     boolList treatEdge(edgeFaces.size(), false);
-    for
-    (
-        Map<label>::const_iterator iter = globalToLocal.begin();
-        iter!=globalToLocal.end();
-        ++iter
-    )
+    forAllConstIters(globalToLocal, iter)
     {
         const label beI = iter();
 
diff --git a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersI.H b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersI.H
index 1f6a359..6ad57b8 100644
--- a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersI.H
+++ b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersI.H
@@ -45,12 +45,11 @@ label boundaryLayers::findNewNodeLabel
 
     if (it != otherVrts_.end())
     {
-        const std::map<std::pair<label, label>, label>& m = it->second;
+        const auto& m = it->second;
 
-        std::map<std::pair<label, label>, label>::const_iterator mit;
         if (m.size() == 2)
         {
-            for (mit = m.begin(); mit!=m.end(); ++mit)
+            forAllConstIters(m, mit)
             {
                 if (mit->first.first != pKey)
                 {
@@ -60,7 +59,7 @@ label boundaryLayers::findNewNodeLabel
         }
         else
         {
-            for (mit = m.begin(); mit!=m.end(); ++mit)
+            forAllConstIters(m, mit)
             {
                 if (mit->first.first == pKey)
                 {
@@ -101,13 +100,12 @@ inline void boundaryLayers::createNewCellFromEdge
     Info<< "Creating cell for edge with nodes " << e << endl;
     Info<< "pKeyI " << pKeyI << endl;
     Info<< "pKeyJ " << pKeyJ << endl;
-    std::map<std::pair<label, label>, label>::const_iterator iter;
-    for (iter = ms.begin(); iter!=ms.end(); ++iter)
+    forAllConstIters(ms, iter)
     {
         Info<< "1. Pair(" << iter->first.first << ", "
             << iter->first.second << ") has value " << iter->second << endl;
     }
-    for (iter = me.begin(); iter!=me.end(); ++iter)
+    forAllConstIters(me, iter)
     {
         Info<< "2. Pair(" << iter->first.first << ", "
             << iter->first.second << ") has value " << iter->second << endl;
@@ -124,8 +122,7 @@ inline void boundaryLayers::createNewCellFromEdge
     }
     else
     {
-        std::map<std::pair<label, label>, label>::const_iterator it;
-        for (it = ms.begin(); it!=ms.end(); ++it)
+        forAllConstIters(ms, it)
         {
             if
             (
@@ -161,8 +158,7 @@ inline void boundaryLayers::createNewCellFromEdge
     }
     else
     {
-        std::map<std::pair<label, label>, label>::const_iterator it;
-        for (it = me.begin(); it!=me.end(); ++it)
+        forAllConstIters(me, it)
         {
             if
             (
diff --git a/meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C b/meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C
index 8320a13..6b1284b 100644
--- a/meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C
+++ b/meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C
@@ -154,7 +154,7 @@ public:
             exchangeData[mse_.beNeiProcs()[procI]].clear();
         }
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -467,12 +467,7 @@ void detectBoundaryLayers::analyseLayers()
         layerAtPatch_[i].clear();
     }
 
-    for
-    (
-        patchToLayerType::const_iterator it = patchToLayer.begin();
-        it!=patchToLayer.end();
-        ++it
-    )
+    forAllConstIters(patchToLayer, it)
     {
         const DynList<label>& layersAtPatch = it->second;
 
diff --git a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
index 63317a2..6b2b500 100644
--- a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
+++ b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
@@ -260,7 +260,7 @@ void extrudeLayer::createNewVertices()
         }
 
         // collect the information about markes points at processor boundaries
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (frontPoints[it()] & FRONTVERTEX)
             {
@@ -331,7 +331,7 @@ void extrudeLayer::createNewVertices()
         dualEdgesMap procPointsDual;
 
         // fill in local data
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (frontPoints[it()] & FRONTVERTEXPROCBND)
             {
@@ -364,7 +364,7 @@ void extrudeLayer::createNewVertices()
         {
             if (Pstream::myProcNo() == procI)
             {
-                forAllConstIter(dualEdgesMap, procPointsDual, it)
+                forAllConstIters(procPointsDual, it)
                 {
                     Pout<< "Point " << it->first
                         << " local dual edges " << it->second << endl;
@@ -461,7 +461,7 @@ void extrudeLayer::createNewVertices()
         }
 
         // fill in the exchangeData map
-        forAllConstIter(dualEdgesMap, procPointsDual, dIter)
+        forAllConstIters(procPointsDual, dIter)
         {
             const label pointI = dIter->first;
 
@@ -516,7 +516,7 @@ void extrudeLayer::createNewVertices()
         {
             if (Pstream::myProcNo() == procI)
             {
-                forAllConstIter(dualEdgesMap, procPointsDual, it)
+                forAllConstIters(procPointsDual, it)
                 {
                     Pout<< "Point " << it->first
                         << " dual edges " << it->second << endl;
@@ -529,7 +529,7 @@ void extrudeLayer::createNewVertices()
         // Finally, find groups of faces and create new vertices
         returnReduce(1, sumOp<label>());
         Pout << "Finding groups of edges at vertex" << endl;
-        forAllConstIter(dualEdgesMap, procPointsDual, dIter)
+        forAllConstIters(procPointsDual, dIter)
         {
             const label pointI = dIter->first;
             const DynList<edge>& dEdges = dIter->second;
@@ -834,7 +834,7 @@ void extrudeLayer::movePoints()
         }
 
         // create displacements from local data
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (it() >= nOrigPoints_)
             {
@@ -910,17 +910,12 @@ void extrudeLayer::movePoints()
         }
 
         // calculate displacements of vertices at processor boundaries
-        for
-        (
-            std::map<label, vector>::const_iterator it = normals.begin();
-            it!=normals.end();
-            ++it
-        )
+        forAllConstIters(normals, it)
         {
             vector n = it->second;
             if (mag(n) > VSMALL)
             {
-                    n /= mag(n);
+                n /= mag(n);
             }
             displacements[it->first - nOrigPoints_] = n*distances[it->first];
         }
diff --git a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.C b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.C
index a7adde5..79d7eed 100644
--- a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.C
+++ b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.C
@@ -301,12 +301,7 @@ void refineBoundaryLayers::activateSpecialMode()
 void refineBoundaryLayers::refineLayers()
 {
     bool refinePatch(false);
-    for
-    (
-        std::map<word, label>::const_iterator it = numLayersForPatch_.begin();
-        it!=numLayersForPatch_.end();
-        ++it
-    )
+    forAllConstIters(numLayersForPatch_, it)
     {
         if (it->second > 1)
         {
diff --git a/meshLibrary/utilities/checkMeshDict/checkMeshDict.C b/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
index ec519b9..43f4e31 100644
--- a/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
+++ b/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
@@ -1074,13 +1074,7 @@ void checkMeshDict::updateRenameBoundary
                 // current state of the dictionary
                 const dictionary& patchDicts = dict.subDict("newPatchNames");
 
-                std::map<word, wordList>::const_iterator it;
-                for
-                (
-                    it = patchesFromPatch.begin();
-                    it!=patchesFromPatch.end();
-                    ++it
-                )
+                forAllConstIters(patchesFromPatch, it)
                 {
                     const word& pName = it->first;
                     const wordList& newNames = it->second;
@@ -1154,8 +1148,7 @@ void checkMeshDict::updateRenameBoundary
                     }
                 }
 
-                std::map<word, wordList>::const_iterator it;
-                for (it = patchesFromPatch.begin(); it!=patchesFromPatch.end(); ++it)
+                forAllConstIters(patchesFromPatch, it)
                 {
                     const word& pName = it->first;
                     const wordList& newNames = it->second;
@@ -1186,8 +1179,7 @@ void checkMeshDict::updateRenameBoundary
             // newPatchNames is not used
             dictionary& newPatchesDict = newDict.subDict("newPatchNames");
 
-            std::map<word, wordList>::const_iterator it;
-            for (it = patchesFromPatch.begin(); it!=patchesFromPatch.end(); ++it)
+            forAllConstIters(patchesFromPatch, it)
             {
                 const wordList& newPatchNames = it->second;
 
@@ -1213,8 +1205,7 @@ void checkMeshDict::updateRenameBoundary
         // create the dictionary if it has not existed before
         dictionary& newPatchesDict = newDict.subDict("newPatchNames");
 
-        std::map<word, wordList>::const_iterator it;
-        for (it = patchesFromPatch.begin(); it!=patchesFromPatch.end(); ++it)
+        forAllConstIters(patchesFromPatch, it)
         {
             const wordList& newPatchNames = it->second;
 
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C b/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C
index 0eaf47a..b4c7d7a 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsFrontalMarking.C
@@ -444,13 +444,7 @@ label groupMarking
         List<List<labelPair>> globalNeiGroups(Pstream::nProcs());
 
         DynList<labelPair> connsAtProc;
-        for
-        (
-            std::map<label, DynList<label>>::const_iterator it =
-            neiGroups.begin();
-            it!=neiGroups.end();
-            ++it
-        )
+        forAllConstIters(neiGroups, it)
         {
             const DynList<label>& ng = it->second;
 
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H b/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
index 76e8fd0..1ca4d78 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsGeometryQueriesI.H
@@ -1821,12 +1821,12 @@ inline label numberOfFaceGroups
 
     labelHashSet triaInRange(containedElements.size());
     const scalar rangeSq = range*range;
-    forAllConstIter(labelHashSet, containedElements, it)
+    for (const label elemi : containedElements)
     {
-        const point p = nearestPointOnTheTriangle(it.key(), surface, centre);
+        const point p = nearestPointOnTheTriangle(elemi, surface, centre);
         if (magSqr(p - centre) < rangeSq)
         {
-            triaInRange.insert(it.key());
+            triaInRange.insert(elemi);
         }
     }
 
@@ -1837,13 +1837,13 @@ inline label numberOfFaceGroups
 
     DynList<label> front;
 
-    forAllConstIter(labelHashSet, triaInRange, it)
+    for (const label triIdx : triaInRange)
     {
-        if (!elGroup.found(it.key()))
+        if (!elGroup.found(triIdx))
         {
             front.clear();
-            front.append(it.key());
-            elGroup.insert(it.key(), nGroups);
+            front.append(triIdx);
+            elGroup.insert(triIdx, nGroups);
 
             while (front.size())
             {
@@ -1913,16 +1913,16 @@ inline label numberOfEdgeGroups
 
     const scalar rangeSq = range*range;
     labelHashSet edgesInRange(containedEdges.size());
-    forAllConstIter(labelHashSet, containedEdges, it)
+    for (const label edgei : containedEdges)
     {
-        const edge& e = edges[it.key()];
-        const point& sp = points[e[0]];
-        const point& ep = points[e[1]];
+        const edge& e = edges[edgei];
+        const point& sp = points[e.first()];
+        const point& ep = points[e.second()];
 
         const point p = nearestPointOnTheEdgeExact(sp, ep, centre);
         if (magSqr(p - centre) < rangeSq)
         {
-            edgesInRange.insert(it.key());
+            edgesInRange.insert(edgei);
         }
     }
 
@@ -1933,13 +1933,13 @@ inline label numberOfEdgeGroups
 
     DynList<label> front;
 
-    forAllConstIter(labelHashSet, edgesInRange, it)
+    for (const label edgei : edgesInRange)
     {
-        if (!elGroup.found(it.key()))
+        if (!elGroup.found(edgei))
         {
             front.clear();
-            front.append(it.key());
-            elGroup.insert(it.key(), nGroups);
+            front.append(edgei);
+            elGroup.insert(edgei, nGroups);
 
             while (front.size())
             {
diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
index 756f09d..5b30791 100644
--- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
+++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C
@@ -151,11 +151,9 @@ void exchangeMap
         FatalError << "Data is not contiguous" << exit(FatalError);
     }
 
-    typename std::map<label, ListType>::const_iterator iter;
-
     // check which processors shall exchange the data and which ones shall not
     labelHashSet receiveData;
-    for (iter = m.begin(); iter!=m.end(); ++iter)
+    forAllConstIters(m, iter)
     {
         OPstream toOtherProc
         (
@@ -167,7 +165,7 @@ void exchangeMap
         toOtherProc << iter->second.size();
     }
 
-    for (iter = m.begin(); iter!=m.end(); ++iter)
+    forAllConstIters(m, iter)
     {
         IPstream fromOtherProc
         (
@@ -190,7 +188,7 @@ void exchangeMap
         // start with blocking type of send and received operation
 
         // send data to other processors
-        for (iter = m.begin(); iter!=m.end(); ++iter)
+        forAllConstIters(m, iter)
         {
             const ListType& dts = iter->second;
 
@@ -209,7 +207,7 @@ void exchangeMap
         }
 
         // receive data from other processors
-        for (iter = m.begin(); iter!=m.end(); ++iter)
+        forAllConstIters(m, iter)
         {
             if (!receiveData.found(iter->first))
             {
@@ -232,7 +230,7 @@ void exchangeMap
         // it does not require any buffer
 
         // receive data from processors with lower ids
-        for (iter = m.begin(); iter!=m.end(); ++iter)
+        forAllConstIters(m, iter)
         {
             if (iter->first >= Pstream::myProcNo())
             {
@@ -253,7 +251,7 @@ void exchangeMap
         }
 
         // send data to processors with greater ids
-        for (iter = m.begin(); iter!=m.end(); ++iter)
+        forAllConstIters(m, iter)
         {
             if (iter->first <= Pstream::myProcNo())
             {
@@ -278,8 +276,7 @@ void exchangeMap
         }
 
         // receive data from processors with greater ids
-        typename std::map<label, ListType>::const_reverse_iterator riter;
-        for (riter = m.rbegin(); riter!=m.rend(); ++riter)
+        forAllConstReverseIters(m, riter)
         {
             if (riter->first <= Pstream::myProcNo())
             {
@@ -300,7 +297,7 @@ void exchangeMap
         }
 
         // send data to processors with lower ids
-        for (riter = m.rbegin(); riter!=m.rend(); ++riter)
+        forAllConstReverseIters(m, riter)
         {
             if (riter->first >= Pstream::myProcNo())
             {
@@ -332,7 +329,7 @@ void exchangeMap
 
     # ifdef DEBUGExchangeMap
     labelList nReceived(Pstream::nProcs(), 0);
-    for (iter = m.begin(); iter!=m.end(); ++iter)
+    forAllConstIters(m, iter)
     {
         nReceived[iter->first] += iter->second.size();
     }
@@ -365,7 +362,7 @@ void exchangeMap
     typename std::map<label, ListType>::const_iterator iter;
 
     // send data to other processors
-    for (iter = m.begin(); iter!=m.end(); ++iter)
+    forAllConstIters(m, iter)
     {
         const ListType& dataToSend = iter->second;
 
@@ -379,7 +376,7 @@ void exchangeMap
     }
 
     // receive data from other processors
-    for (iter = m.begin(); iter!=m.end(); ++iter)
+    forAllConstIters(m, iter)
     {
         mOut.insert(std::make_pair(iter->first, List<T>()));
         List<T>& dataToReceive = mOut[iter->first];
diff --git a/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C b/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C
index d1747e0..c67f1d8 100644
--- a/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C
+++ b/meshLibrary/utilities/intersectionTools/findCellsIntersectingSurface/findCellsIntersectingSurface.C
@@ -122,9 +122,9 @@ void findCellsIntersectingSurface::findIntersectedCells()
         // remove triangles which do not intersect the bounding box
         labelHashSet reasonableCandidates;
 
-        forAllConstIter(labelHashSet, triangles, tIter)
+        for (const label triIdx : triangles)
         {
-            const labelledTri& tri = surf[tIter.key()];
+            const labelledTri& tri = surf[triIdx];
 
             boundBox obb(sp[tri[0]], sp[tri[0]]);
             for (label i = 1; i < 3; ++i)
@@ -140,7 +140,7 @@ void findCellsIntersectingSurface::findIntersectedCells()
 
             if (obb.overlaps(bb))
             {
-                reasonableCandidates.insert(tIter.key());
+                reasonableCandidates.insert(triIdx);
             }
         }
 
@@ -148,9 +148,9 @@ void findCellsIntersectingSurface::findIntersectedCells()
 
         // check if any of the surface vertices is contained within the cell
         labelHashSet nodes, facetsInCell;
-        forAllConstIter(labelHashSet, triangles, tIter)
+        for (const label triIdx : triangles)
         {
-            const labelledTri& tri = surf[tIter.key()];
+            const labelledTri& tri = surf[triIdx];
 
             forAll(tri, i)
             {
@@ -159,9 +159,9 @@ void findCellsIntersectingSurface::findIntersectedCells()
         }
 
         // check which surface nodes are within the cell
-        forAllConstIter(labelHashSet, nodes, nIter)
+        for (const label nodei : nodes)
         {
-            const point& p = sp[nIter.key()];
+            const point& p = sp[nodei];
 
             if (!bb.contains(p))
             {
@@ -188,11 +188,11 @@ void findCellsIntersectingSurface::findIntersectedCells()
                         if (help::pointInTetrahedron(p, tet))
                         {
                             intersected = true;
-                            forAllRow(pointFacets, nIter.key(), ptI)
+                            forAllRow(pointFacets, nodei, ptI)
                             {
                                 facetsInCell.insert
                                 (
-                                    pointFacets(nIter.key(), ptI)
+                                    pointFacets(nodei, ptI)
                                 );
                             }
 
@@ -221,11 +221,11 @@ void findCellsIntersectingSurface::findIntersectedCells()
                         if (help::pointInTetrahedron(p, tet))
                         {
                             intersected = true;
-                            forAllRow(pointFacets, nIter.key(), ptI)
+                            forAllRow(pointFacets, nodei, ptI)
                             {
                                 facetsInCell.insert
                                 (
-                                    pointFacets(nIter.key(), ptI)
+                                    pointFacets(nodei, ptI)
                                 );
                             }
 
@@ -244,9 +244,9 @@ void findCellsIntersectingSurface::findIntersectedCells()
 
         // check if any triangle in the surface mesh
         // intersects any of the cell's faces
-        forAllConstIter(labelHashSet, triangles, tIter)
+        for (const label triIdx : triangles)
         {
-            if (facetsInCell.found(tIter.key()))
+            if (facetsInCell.found(triIdx))
             {
                 continue;
             }
@@ -259,7 +259,7 @@ void findCellsIntersectingSurface::findIntersectedCells()
                     help::doFaceAndTriangleIntersect
                     (
                         surf,
-                        tIter.key(),
+                        triIdx,
                         f,
                         points
                     );
@@ -267,7 +267,7 @@ void findCellsIntersectingSurface::findIntersectedCells()
                 if (intersect)
                 {
                     intersected = true;
-                    facetsInCell.insert(tIter.key());
+                    facetsInCell.insert(triIdx);
                     break;
                 }
             }
diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
index 1e9deb2..33e6451 100644
--- a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
+++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C
@@ -153,7 +153,7 @@ partTetMesh::partTetMesh
                 mesh.addressingData().globalToLocalPointAddressing();
 
             std::map<label, LongList<label>> eData;
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label pointI = iter();
 
@@ -295,7 +295,7 @@ partTetMesh::partTetMesh
                 mesh.addressingData().globalToLocalPointAddressing();
 
             std::map<label, LongList<label>> eData;
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label pointI = iter();
 
diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C
index e834636..c3b769f 100644
--- a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C
+++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C
@@ -103,7 +103,7 @@ void partTetMesh::createParallelAddressing
     // make sure that the same vertices are marked for smoothing on all procs
     // this is performed by sending the labels of vertices which are not used
     // for tet mesh creation and the tet mesh vertices which are not moved
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -143,7 +143,7 @@ void partTetMesh::createParallelAddressing
         smoothVertex_[nodeLabelForPoint[pointI]] = NONE;
     }
 
-    for (iter = exchangeData.begin(); iter!=exchangeData.end(); ++iter)
+    forAllIters(exchangeData, iter)
     {
         iter->second.clear();
     }
@@ -153,7 +153,7 @@ void partTetMesh::createParallelAddressing
     label startPoint(0), nLocalPoints(0), nSharedPoints(0);
 
     // count the number of points at processor boundaries
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -192,7 +192,7 @@ void partTetMesh::createParallelAddressing
     }
 
     // create global labels for points at processor boundaries
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -290,7 +290,7 @@ void partTetMesh::createParallelAddressing
     }
     DynList<label>& neiProcs = *neiProcsPtr_;
 
-    for (iter = exchangeData.begin(); iter!=exchangeData.end(); ++iter)
+    forAllConstIters(exchangeData, iter)
     {
         neiProcs.append(iter->first);
     }
@@ -503,7 +503,7 @@ void partTetMesh::createBufferLayers()
 
     // insert the global labels of the buffer points
     // into the globalToLocal map
-    forAllConstIter(Map<label>, newGlobalToLocal, it)
+    forAllConstIters(newGlobalToLocal, it)
     {
         globalToLocal.insert(it.key(), it());
     }
@@ -513,7 +513,7 @@ void partTetMesh::createBufferLayers()
     {
         if (Pstream::myProcNo() == i)
         {
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 DynList<label> np;
                 if (it() < pProcs.size())
diff --git a/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C b/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C
index dc27f9b..ce11313 100644
--- a/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C
+++ b/meshLibrary/utilities/meshes/partTriMesh/partTriMesh.C
@@ -138,7 +138,7 @@ partTriMesh::partTriMesh
                 meshSurface.globalToLocalBndPointAddressing();
 
             std::map<label, labelLongList> eData;
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label bpI = iter();
 
diff --git a/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C b/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C
index 75d829b..80f95ea 100644
--- a/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C
+++ b/meshLibrary/utilities/meshes/partTriMesh/partTriMeshAddressing.C
@@ -170,17 +170,17 @@ void partTriMesh::createPointsAndTrias
     }
 
     // set CORNER and FEATUREEDGE flags to surface points
-    forAllConstIter(labelHashSet, mPart_.corners(), it)
+    for (const label corneri : mPart_.corners())
     {
-        if (meshSurfacePointLabelInTriMesh_[it.key()] != -1)
+        if (meshSurfacePointLabelInTriMesh_[corneri] != -1)
         {
-            pointType_[meshSurfacePointLabelInTriMesh_[it.key()]] |= CORNER;
+            pointType_[meshSurfacePointLabelInTriMesh_[corneri]] |= CORNER;
         }
     }
 
-    forAllConstIter(labelHashSet, mPart_.edgePoints(), it)
+    for (const label edgei : mPart_.edgePoints())
     {
-        const label pI = meshSurfacePointLabelInTriMesh_[it.key()];
+        const label pI = meshSurfacePointLabelInTriMesh_[edgei];
         if (pI != -1)
         {
             pointType_[pI] |= FEATUREEDGE;
diff --git a/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C b/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
index cb82fca..4838cf8 100644
--- a/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
+++ b/meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
@@ -106,7 +106,7 @@ void partTriMesh::createParallelAddressing
     // make sure that the same vertices are marked for smoothing on all procs
     // this is performed by sending the labels of vertices which are not used
     // for tet mesh creation and the tet mesh vertices which are not moved
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -146,7 +146,7 @@ void partTriMesh::createParallelAddressing
         pointType_[nodeLabelForPoint[pointI]] = NONE;
     }
 
-    for (iter = exchangeData.begin(); iter!=exchangeData.end(); ++iter)
+    forAllIters(exchangeData, iter)
     {
         iter->second.clear();
     }
@@ -156,7 +156,7 @@ void partTriMesh::createParallelAddressing
     label startPoint(0), nLocalPoints(0), nSharedPoints(0);
 
     // count the number of points at processor boundaries
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -195,7 +195,7 @@ void partTriMesh::createParallelAddressing
     }
 
     // create global labels for points at processor boundaries
-    forAllConstIter(Map<label>, globalToLocalPointAddressing, it)
+    forAllConstIters(globalToLocalPointAddressing, it)
     {
         const label pI = it();
 
@@ -293,7 +293,7 @@ void partTriMesh::createParallelAddressing
     }
     DynList<label>& neiProcs = *neiProcsPtr_;
 
-    for (iter = exchangeData.begin(); iter!=exchangeData.end(); ++iter)
+    forAllConstIters(exchangeData, iter)
     {
         neiProcs.append(iter->first);
     }
@@ -389,13 +389,7 @@ void partTriMesh::createBufferLayers()
     Map<label> newGlobalToLocal;
     std::map<label, point> addCoordinates;
     label nPoints = pts.size();
-    for
-    (
-        std::map<label, List<parTriFace>>::const_iterator it =
-        receivedTriangles.begin();
-        it!=receivedTriangles.end();
-        ++it
-    )
+    forAllConstIters(receivedTriangles, it)
     {
         const List<parTriFace>& receivedTrias = it->second;
 
@@ -471,12 +465,7 @@ void partTriMesh::createBufferLayers()
 
     // store newly added points
     pts.setSize(nPoints);
-    for
-    (
-        std::map<label, point>::const_iterator it = addCoordinates.begin();
-        it!=addCoordinates.end();
-        ++it
-    )
+    forAllConstIters(addCoordinates, it)
     {
         pts[it->first] = it->second;
     }
@@ -485,8 +474,10 @@ void partTriMesh::createBufferLayers()
 
     // insert the global labels of the buffer points
     // into the globalToLocal map
-    forAllConstIter(Map<label>, newGlobalToLocal, it)
+    forAllConstIters(newGlobalToLocal, it)
+    {
         globalToLocal.insert(it.key(), it());
+    }
 
     // update addressing of the surface mesh
     surf_.clearAddressing();
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C
index b694193..7b6ff2f 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCells.C
@@ -352,12 +352,7 @@ label polyMeshGenCells::addCellSubset(const word& selName)
     }
 
     id = 0;
-    for
-    (
-        std::map<label, meshSubset>::const_iterator it = cellSubsets_.begin();
-        it != cellSubsets_.end();
-        ++it
-    )
+    forAllConstIters(cellSubsets_, it)
     {
         id = Foam::max(id, it->first + 1);
     }
@@ -402,8 +397,7 @@ word polyMeshGenCells::cellSubsetName(const label setI) const
 
 label polyMeshGenCells::cellSubsetIndex(const word& selName) const
 {
-    std::map<label, meshSubset>::const_iterator it;
-    for (it = cellSubsets_.begin(); it != cellSubsets_.end(); ++it)
+    forAllConstIters(cellSubsets_, it)
     {
         if (it->second.name() == selName)
         {
@@ -496,8 +490,7 @@ void polyMeshGenCells::write() const
     polyMeshGenFaces::write();
 
     // write cell subsets
-    std::map<label, meshSubset>::const_iterator setIt;
-    for (setIt = cellSubsets_.begin(); setIt != cellSubsets_.end(); ++setIt)
+    forAllConstIters(cellSubsets_, setIt)
     {
         cellSet set
         (
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
index 3810348..67b602f 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
@@ -45,7 +45,7 @@ inline void polyMeshGenCells::addCellToSubset
     const label cellI
 )
 {
-    std::map<label, meshSubset>::iterator it = cellSubsets_.find(selID);
+    auto it = cellSubsets_.find(selID);
     if (it == cellSubsets_.end())
     {
         return;
@@ -61,7 +61,7 @@ inline void polyMeshGenCells::removeCellFromSubset
     const label cellI
 )
 {
-    std::map<label, meshSubset>::iterator it = cellSubsets_.find(selID);
+    auto it = cellSubsets_.find(selID);
     if (it == cellSubsets_.end())
     {
         return;
@@ -79,13 +79,7 @@ inline void polyMeshGenCells::cellInSubsets
 {
     cellSubsets.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = cellSubsets_.begin();
-        it!=cellSubsets_.end();
-        ++it
-    )
+    forAllConstIters(cellSubsets_, it)
     {
         if (it->second.contains(cellI))
         {
@@ -99,13 +93,7 @@ inline void polyMeshGenCells::cellSubsetIndices(DynList<label>& indices) const
 {
     indices.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = cellSubsets_.begin();
-        it!=cellSubsets_.end();
-        ++it
-    )
+    forAllConstIters(cellSubsets_, it)
     {
         indices.append(it->first);
     }
@@ -121,8 +109,7 @@ inline void polyMeshGenCells::cellsInSubset
 {
     cellLabels.clear();
 
-    std::map<label, meshSubset>::const_iterator it =
-        cellSubsets_.find(selID);
+    auto it = cellSubsets_.find(selID);
     if (it == cellSubsets_.end())
     {
         return;
@@ -138,12 +125,7 @@ inline void polyMeshGenCells::updateCellSubsets
     const ListType& newCellLabels
 )
 {
-    for
-    (
-        std::map<label, meshSubset>::iterator it = cellSubsets_.begin();
-        it!=cellSubsets_.end();
-        ++it
-    )
+    forAllIters(cellSubsets_, it)
     {
         it->second.updateSubset(newCellLabels);
     }
@@ -155,12 +137,7 @@ inline void polyMeshGenCells::updateCellSubsets
     const VRWGraph& newCellsForCell
 )
 {
-    for
-    (
-        std::map<label, meshSubset>::iterator it = cellSubsets_.begin();
-        it!=cellSubsets_.end();
-        ++it
-    )
+    forAllIters(cellSubsets_, it)
     {
         it->second.updateSubset(newCellsForCell);
     }
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C
index 2e7fe70..5d65f72 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFaces.C
@@ -280,12 +280,7 @@ label polyMeshGenFaces::addFaceSubset(const word& setName)
     }
 
     id = 0;
-    for
-    (
-        std::map<label, meshSubset>::const_iterator it = faceSubsets_.begin();
-        it!=faceSubsets_.end();
-        ++it
-    )
+    forAllConstIters(faceSubsets_, it)
     {
         id = Foam::max(id, it->first + 1);
     }
@@ -330,8 +325,7 @@ word polyMeshGenFaces::faceSubsetName(const label setI) const
 
 label polyMeshGenFaces::faceSubsetIndex(const word& setName) const
 {
-    std::map<label, meshSubset>::const_iterator it;
-    for (it = faceSubsets_.begin(); it!=faceSubsets_.end(); ++it)
+    forAllConstIters(faceSubsets_, it)
     {
         if (it->second.name() == setName)
         {
@@ -550,8 +544,7 @@ void polyMeshGenFaces::write() const
     patches.write();
 
     // write face subsets
-    std::map<label, meshSubset>::const_iterator setIt;
-    for (setIt = faceSubsets_.begin(); setIt!=faceSubsets_.end(); ++setIt)
+    forAllConstIters(faceSubsets_, setIt)
     {
         faceSet set
         (
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
index 68c3b3d..88aa3c8 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
@@ -154,13 +154,7 @@ inline void polyMeshGenFaces::faceInSubsets
 {
     faceSubsets.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = faceSubsets_.begin();
-        it!=faceSubsets_.end();
-        ++it
-    )
+    forAllConstIters(faceSubsets_, it)
     {
         if (it->second.contains(faceI))
         {
@@ -174,13 +168,7 @@ inline void polyMeshGenFaces::faceSubsetIndices(DynList<label>& indices) const
 {
     indices.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = faceSubsets_.begin();
-        it!=faceSubsets_.end();
-        ++it
-    )
+    forAllConstIters(faceSubsets_, it)
     {
         indices.append(it->first);
     }
@@ -196,8 +184,7 @@ inline void polyMeshGenFaces::facesInSubset
 {
     faceLabels.clear();
 
-    std::map<label, meshSubset>::const_iterator it =
-        faceSubsets_.find(setI);
+    std::map<label, meshSubset>::const_iterator it = faceSubsets_.find(setI);
     if (it == faceSubsets_.end())
     {
         return;
@@ -210,12 +197,7 @@ inline void polyMeshGenFaces::facesInSubset
 template<class ListType>
 inline void polyMeshGenFaces::updateFaceSubsets(const ListType& newFaceLabels)
 {
-    for
-    (
-        std::map<label, meshSubset>::iterator it = faceSubsets_.begin();
-        it!=faceSubsets_.end();
-        ++it
-    )
+    forAllIters(faceSubsets_, it)
     {
         it->second.updateSubset(newFaceLabels);
     }
@@ -224,12 +206,7 @@ inline void polyMeshGenFaces::updateFaceSubsets(const ListType& newFaceLabels)
 
 inline void polyMeshGenFaces::updateFaceSubsets(const VRWGraph& newFacesForFace)
 {
-    for
-    (
-        std::map<label, meshSubset>::iterator it = faceSubsets_.begin();
-        it!=faceSubsets_.end();
-        ++it
-    )
+    forAllIters(faceSubsets_, it)
     {
         it->second.updateSubset(newFacesForFace);
     }
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C
index 20eadae..1c96124 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.C
@@ -91,8 +91,7 @@ label polyMeshGenPoints::addPointSubset(const word& subsetName)
     }
 
     id = 0;
-    std::map<label, meshSubset>::const_iterator it;
-    for (it = pointSubsets_.begin(); it!=pointSubsets_.end(); ++it)
+    forAllConstIters(pointSubsets_, it)
     {
         id = Foam::max(id, it->first + 1);
     }
@@ -137,8 +136,7 @@ word polyMeshGenPoints::pointSubsetName(const label subsetID) const
 
 label polyMeshGenPoints::pointSubsetIndex(const word& subsetName) const
 {
-    std::map<label, meshSubset>::const_iterator it;
-    for (it = pointSubsets_.begin(); it!=pointSubsets_.end(); ++it)
+    forAllConstIters(pointSubsets_, it)
     {
         if (it->second.name() == subsetName)
         {
@@ -192,11 +190,10 @@ void polyMeshGenPoints::write() const
 {
     points_.write();
 
-    std::map<label, meshSubset>::const_iterator setIt;
     labelLongList containedElements;
 
     // write point selections
-    for (setIt = pointSubsets_.begin(); setIt!=pointSubsets_.end(); ++setIt)
+    forAllConstIters(pointSubsets_, setIt)
     {
         pointSet set
         (
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
index 1de0739..1b74eab 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
@@ -96,16 +96,12 @@ inline void polyMeshGenPoints::pointInSubsets
 {
     pointSubsets.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = pointSubsets_.begin();
-        it!=pointSubsets_.end();
-        ++it
-    )
+    forAllConstIters(pointSubsets_, it)
     {
         if (it->second.contains(pointI))
+        {
             pointSubsets.append(it->first);
+        }
     }
 }
 
@@ -114,13 +110,7 @@ inline void polyMeshGenPoints::pointSubsetIndices(DynList<label>& indices) const
 {
     indices.clear();
 
-    std::map<label, meshSubset>::const_iterator it;
-    for
-    (
-        it = pointSubsets_.begin();
-        it!=pointSubsets_.end();
-        ++it
-    )
+    forAllConstIters(pointSubsets_, it)
     {
         indices.append(it->first);
     }
@@ -149,12 +139,7 @@ inline void polyMeshGenPoints::pointsInSubset
 template<class ListType>
 inline void polyMeshGenPoints::updatePointSubsets(const ListType& newNodeLabels)
 {
-    for
-    (
-        std::map<label, meshSubset>::iterator it = pointSubsets_.begin();
-        it!=pointSubsets_.end();
-        ++it
-    )
+    forAllIters(pointSubsets_, it)
     {
         it->second.updateSubset(newNodeLabels);
     }
diff --git a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
index 39e63c7..66f26b6 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
@@ -120,12 +120,10 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
         forAll(procBoundaries, patchI)
         {
-            const std::map<label, std::pair<label, label>>& patchPointsMap =
-                patchPoints[patchI];
-            std::map<label, std::pair<label, label>>::const_iterator it;
+            const auto& patchPointsMap = patchPoints[patchI];
 
             labelLongList dataToSend;
-            for (it = patchPointsMap.begin(); it!=patchPointsMap.end(); ++it)
+            forAllConstIters(patchPointsMap, it)
             {
                 // data is sent as follows
                 // 1. face position in patch
@@ -237,12 +235,10 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
 
         forAll(procBoundaries, patchI)
         {
-            const std::map<label, std::pair<label, label>>& patchPointsMap =
-                patchPoints[patchI];
-            std::map<label, std::pair<label, label>>::const_iterator it;
+            const auto& patchPointsMap = patchPoints[patchI];
 
             labelLongList dataToSend;
-            for (it = patchPointsMap.begin(); it!=patchPointsMap.end(); ++it)
+            forAllConstIters(patchPointsMap, it)
             {
                 if (globalPointLabel[it->first] != -1)
                 {
diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
index f78a2e4..6310b22 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
@@ -79,13 +79,13 @@ void polyMeshGenModifier::addBufferCells()
 
         faceI = 0;
         List<labelledPoint> ptsToSend(pointsToSend.size());
-        forAllConstIter(labelHashSet, pointsToSend, it)
+        for (const label pointi : pointsToSend)
         {
             ptsToSend[faceI++] =
                 labelledPoint
                 (
-                    globalPointLabel[it.key()],
-                    points[it.key()]
+                    globalPointLabel[pointi],
+                    points[pointi]
                 );
         }
 
@@ -143,9 +143,9 @@ void polyMeshGenModifier::addBufferCells()
         }
 
         labelLongList flattenedCells;
-        forAllConstIter(labelHashSet, cellsToSend, it)
+        for (const label celli : cellsToSend)
         {
-            const cell& c = cells[it.key()];
+            const cell& c = cells[celli];
 
             // the number of faces in the cell
             flattenedCells.append(c.size());
diff --git a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
index 9881a10..b36626f 100644
--- a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
+++ b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
@@ -117,9 +117,9 @@ inline void meshSubset::containedElements(ListType& l) const
     l.setSize(data_.size());
 
     label counter(0);
-    forAllConstIter(std::set<label>, data_, it)
+    for (const label elemi : data_)
     {
-        l[counter++] = *it;
+        l[counter++] = elemi;
     }
 }
 
@@ -141,14 +141,14 @@ inline void meshSubset::updateSubset(const ListType& newLabels)
 {
     std::set<label> newData;
 
-    forAllConstIter(std::set<label>, data_, it)
+    for (const label elemi : data_)
     {
-        if (newLabels[*it] < 0)
+        if (newLabels[elemi] < 0)
         {
             continue;
         }
 
-        newData.insert(newLabels[*it]);
+        newData.insert(newLabels[elemi]);
     }
 
     data_ = newData;
@@ -159,11 +159,11 @@ inline void meshSubset::updateSubset(const VRWGraph& newLabels)
 {
     std::set<label> newData;
 
-    forAllConstIter(std::set<label>, data_, it)
+    for (const label elemi : data_)
     {
-        forAllRow(newLabels, *it, i)
+        forAllRow(newLabels, elemi, i)
         {
-            newData.insert(newLabels(*it, i));
+            newData.insert(newLabels(elemi, i));
         }
     }
 
@@ -198,9 +198,9 @@ inline bool meshSubset::operator==(const meshSubset& ms) const
         return false;
     }
 
-    forAllConstIter(std::set<label>, data_, it)
+    for (const label elemi : data_)
     {
-        if (ms.data_.find(*it) == ms.data_.end())
+        if (ms.data_.find(elemi) == ms.data_.end())
         {
             return false;
         }
@@ -226,9 +226,9 @@ inline Ostream& operator<<(Ostream& os, const meshSubset& sel)
 
     labelList data(sel.data_.size());
     label counter(0);
-    forAllConstIter(std::set<label>, sel.data_, it)
+    for (const label elemi : sel.data_)
     {
-        data[counter++] = *it;
+        data[counter++] = elemi;
     }
 
     os << nl << data;
@@ -245,9 +245,9 @@ inline Istream& operator>>(Istream& is, meshSubset& sel)
     is >> sel.name_ >> sel.type_ >> data;
 
     sel.data_.clear();
-    forAll(data, i)
+    for (const label elemi : data)
     {
-        sel.data_.insert(data[i]);
+        sel.data_.insert(elemi);
     }
 
     is.check(FUNCTION_NAME);
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurf.C b/meshLibrary/utilities/meshes/triSurf/triSurf.C
index e682cbb..a344837 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurf.C
+++ b/meshLibrary/utilities/meshes/triSurf/triSurf.C
@@ -144,7 +144,7 @@ void triSurf::writeToFMS(const fileName& fName) const
     List<meshSubset> subsets;
     label i(0);
     subsets.setSize(pointSubsets_.size());
-    forAllConstIter(Map<meshSubset>, pointSubsets_, it)
+    forAllConstIters(pointSubsets_, it)
     {
         subsets[i++] = it();
     }
@@ -155,7 +155,7 @@ void triSurf::writeToFMS(const fileName& fName) const
     // write subsets of facets
     subsets.setSize(triSurfFacets::facetSubsets_.size());
     i = 0;
-    forAllConstIter(Map<meshSubset>, triSurfFacets::facetSubsets_, it)
+    forAllConstIters(triSurfFacets::facetSubsets_, it)
     {
         subsets[i++] = it();
     }
@@ -166,12 +166,7 @@ void triSurf::writeToFMS(const fileName& fName) const
     // write subets of feature edges
     subsets.setSize(triSurfFeatureEdges::featureEdgeSubsets_.size());
     i = 0;
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        triSurfFeatureEdges::featureEdgeSubsets_,
-        it
-    )
+    forAllConstIters(triSurfFeatureEdges::featureEdgeSubsets_, it)
     {
         subsets[i++] = it();
     }
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C b/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
index 8cc76ac..dcc1eda 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
@@ -104,8 +104,7 @@ void triSurfAddressing::calculateEdges() const
                 }
             }
 
-            std::set<std::pair<label, label>>::const_iterator it;
-            for (it = edgesAtPoint.begin(); it!=edgesAtPoint.end(); ++it)
+            forAllConstIters(edgesAtPoint, it)
             {
                 edgesHelper.append(edge(it->first, it->second));
             }
@@ -261,9 +260,9 @@ void triSurfAddressing::calculateFacetFacetsEdges() const
         facetFacetsEdgesPtr_->setRowSize(facetI, fLabels.size());
 
         label counter(0);
-        forAllConstIter(labelHashSet, fLabels, iter)
+        for (const label facei : fLabels)
         {
-            facetFacetsEdgesPtr_->operator()(facetI, counter++) = iter.key();
+            facetFacetsEdgesPtr_->operator()(facetI, counter++) = facei;
         }
     }
 }
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C b/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C
index 4b6773c..b781a5f 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFacets.C
@@ -118,7 +118,7 @@ label triSurfFacets::addFacetSubset(const word& subsetName)
     }
 
     id = 0;
-    forAllConstIter(Map<meshSubset>, facetSubsets_, it)
+    forAllConstIters(facetSubsets_, it)
     {
         id = Foam::max(id, it.key()+1);
     }
@@ -159,7 +159,7 @@ word triSurfFacets::facetSubsetName(const label subsetID) const
 
 label triSurfFacets::facetSubsetIndex(const word& subsetName) const
 {
-    forAllConstIter(Map<meshSubset>, facetSubsets_, it)
+    forAllConstIters(facetSubsets_, it)
     {
         if (it().name() == subsetName)
         {
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H b/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
index 18507d0..bd17c8e 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
@@ -96,12 +96,7 @@ inline void triSurfFacets::facetInSubsets
 {
     facetSubsets.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        facetSubsets_,
-        it
-    )
+    forAllConstIters(facetSubsets_, it)
     {
         if (it().contains(triI))
         {
@@ -115,12 +110,7 @@ inline void triSurfFacets::facetSubsetIndices(DynList<label>& indices) const
 {
     indices.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        facetSubsets_,
-        it
-    )
+    forAllConstIters(facetSubsets_, it)
     {
         indices.append(it.key());
     }
@@ -149,12 +139,7 @@ inline void triSurfFacets::facetsInSubset
 template<class ListType>
 inline void triSurfFacets::updateFacetsSubsets(const ListType& newFacetsLabels)
 {
-    for
-    (
-        Map<meshSubset>::iterator it = facetSubsets_.begin();
-        it!=facetSubsets_.end();
-        ++it
-    )
+    forAllIters(facetSubsets_, it)
     {
         it().updateSubset(newFacetsLabels);
     }
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C
index b2fc1fc..030e2a6 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdges.C
@@ -62,7 +62,7 @@ label triSurfFeatureEdges::addEdgeSubset(const word& subsetName)
     }
 
     id = 0;
-    forAllConstIter(Map<meshSubset>, featureEdgeSubsets_, it)
+    forAllConstIters(featureEdgeSubsets_, it)
     {
         id = Foam::max(id, it.key()+1);
     }
@@ -103,7 +103,7 @@ word triSurfFeatureEdges::edgeSubsetName(const label subsetID) const
 
 label triSurfFeatureEdges::edgeSubsetIndex(const word& subsetName) const
 {
-    forAllConstIter(Map<meshSubset>, featureEdgeSubsets_, it)
+    forAllConstIters(featureEdgeSubsets_, it)
     {
         if (it().name() == subsetName)
         {
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
index 4a7c61f..12c87ee 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
@@ -91,12 +91,7 @@ inline void triSurfFeatureEdges::edgeInSubsets
 {
     edgeSubsets.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        featureEdgeSubsets_,
-        it
-    )
+    forAllConstIters(featureEdgeSubsets_, it)
     {
         if (it().contains(eI))
         {
@@ -113,12 +108,7 @@ inline void triSurfFeatureEdges::edgeSubsetIndices
 {
     indices.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        featureEdgeSubsets_,
-        it
-    )
+    forAllConstIters(featureEdgeSubsets_, it)
     {
         indices.append(it.key());
     }
@@ -150,12 +140,7 @@ inline void triSurfFeatureEdges::updateEdgeSubsets
     const ListType& newEdgeLabels
 )
 {
-    for
-    (
-        Map<meshSubset>::iterator it = featureEdgeSubsets_.begin();
-        it!=featureEdgeSubsets_.end();
-        ++it
-    )
+    forAllIters(featureEdgeSubsets_, it)
     {
         it().updateSubset(newEdgeLabels);
     }
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C b/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C
index 3107d2f..4a0b1d5 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfPoints.C
@@ -62,7 +62,7 @@ label triSurfPoints::addPointSubset(const word& subsetName)
     }
 
     id = 0;
-    forAllConstIter(Map<meshSubset>, pointSubsets_, it)
+    forAllConstIters(pointSubsets_, it)
     {
         id = Foam::max(id, it.key()+1);
     }
@@ -103,7 +103,7 @@ word triSurfPoints::pointSubsetName(const label subsetID) const
 
 label triSurfPoints::pointSubsetIndex(const word& subsetName) const
 {
-    forAllConstIter(Map<meshSubset>, pointSubsets_, it)
+    forAllConstIters(pointSubsets_, it)
     {
         if (it().name() == subsetName)
         {
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H b/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
index fb3ed25..6f076ed 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
@@ -92,12 +92,7 @@ inline void triSurfPoints::pointInSubsets
 {
     pointSubsets.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        pointSubsets_,
-        it
-    )
+    forAllConstIters(pointSubsets_, it)
     {
         if (it().contains(pointI))
         {
@@ -111,12 +106,7 @@ inline void triSurfPoints::pointSubsetIndices(DynList<label>& indices) const
 {
     indices.clear();
 
-    forAllConstIter
-    (
-        Map<meshSubset>,
-        pointSubsets_,
-        it
-    )
+    forAllConstIters(pointSubsets_, it)
     {
         indices.append(it.key());
     }
@@ -146,12 +136,7 @@ inline void triSurfPoints::pointsInSubset
 template<class ListType>
 inline void triSurfPoints::updatePointSubsets(const ListType& newNodeLabels)
 {
-    for
-    (
-        Map<meshSubset>::iterator it = pointSubsets_.begin();
-        it!=pointSubsets_.end();
-        ++it
-    )
+    forAllIters(pointSubsets_, it)
     {
         it().updateSubset(newNodeLabels);
     }
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C
index 66d70c4..188d948 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressing.C
@@ -210,7 +210,7 @@ bool meshOctreeAddressing::isIntersectedFace(const label fI) const
         }
     }
 
-    forAllConstIter(Map<label>, nAppearances, iter)
+    forAllConstIters(nAppearances, iter)
     {
         if (iter() == 2)
         {
@@ -294,7 +294,7 @@ bool meshOctreeAddressing::isIntersectedEdge(const label eI) const
         }
     }
 
-    forAllConstIter(Map<label>, nAppearances, iter)
+    forAllConstIters(nAppearances, iter)
     {
         if (iter() == edgeCubes.sizeOfRow(eI))
         {
@@ -371,7 +371,7 @@ void meshOctreeAddressing::edgeIntersections
 
     point intersection(vector::zero);
 
-    forAllConstIter(Map<label>, nAppearances, iter)
+    forAllConstIters(nAppearances, iter)
     {
         if (iter() == edgeCubes.sizeOfRow(eI))
         {
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C
index c096429..adaf958 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C
@@ -569,9 +569,9 @@ void meshOctreeAddressing::findUsedBoxes() const
             boolList removeFacets(ts.size(), false);
 
             // remove facets in patches
-            forAllConstIter(HashSet<word>, patchesToRemove, it)
+            for (const word& patchName : patchesToRemove)
             {
-                const labelList matchedPatches = ts.findPatches(it.key());
+                const labelList matchedPatches = ts.findPatches(patchName);
                 boolList activePatch(ts.patches().size(), false);
                 forAll(matchedPatches, ptchI)
                 {
@@ -588,9 +588,9 @@ void meshOctreeAddressing::findUsedBoxes() const
             }
 
             // remove facets in subsets
-            forAllConstIter(HashSet<word>, patchesToRemove, it)
+            for (const word& patchName : patchesToRemove)
             {
-                const label subsetID = ts.facetSubsetIndex(it.key());
+                const label subsetID = ts.facetSubsetIndex(patchName);
                 if (subsetID >= 0)
                 {
                     labelLongList facets;
@@ -647,9 +647,9 @@ void meshOctreeAddressing::findUsedBoxes() const
         boolList keepFacets(ts.size(), false);
 
         // keep facets in patches
-        forAllConstIter(HashSet<word>, patchesToKeep, it)
+        for (const word& patchName : patchesToKeep)
         {
-            const labelList matchedPatches = ts.findPatches(it.key());
+            const labelList matchedPatches = ts.findPatches(patchName);
             boolList activePatch(ts.patches().size(), false);
             forAll(matchedPatches, ptchI)
             {
@@ -666,9 +666,9 @@ void meshOctreeAddressing::findUsedBoxes() const
         }
 
         // keep facets in subsets
-        forAllConstIter(wordHashSet, patchesToKeep, it)
+        for (const word& patchName : patchesToKeep)
         {
-            const label subsetID = ts.facetSubsetIndex(it.key());
+            const label subsetID = ts.facetSubsetIndex(patchName);
 
             if (subsetID >= 0)
             {
@@ -753,7 +753,7 @@ void meshOctreeAddressing::findUsedBoxes() const
             );
         }
 
-        forAllConstIter(Map<label>, globalLeafToLocal, iter)
+        forAllConstIters(globalLeafToLocal, iter)
         {
             const label leafI = iter();
 
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C
index 0618285..7e3f715 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingGluedMesh.C
@@ -139,9 +139,8 @@ void meshOctreeAddressing::checkGluedRegions()
             } while (!finished);
 
             labelHashSet permissibleNeighbours;
-            forAllConstIter(labelHashSet, innerNodes, it)
+            for (const label nodeI : innerNodes)
             {
-                const label nodeI = it.key();
                 forAllRow(nodeLeaves, nodeI, nlI)
                 {
                     permissibleNeighbours.insert(nodeLeaves(nodeI, nlI));
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C
index 10b7a17..158cf22 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingIrregularConnections.C
@@ -208,9 +208,9 @@ void meshOctreeAddressing::checkAndFixIrregularConnections()
         if (Pstream::parRun() && (nIrregular != 0))
         {
             LongList<meshOctreeCubeCoordinates> exchangeData;
-            forAllConstIter(labelHashSet, changedBoxType, it)
+            for (const label it : changedBoxType)
             {
-                exchangeData.append(octree_.returnLeaf(it.key()).coordinates());
+                exchangeData.append(octree_.returnLeaf(it).coordinates());
             }
 
             LongList<meshOctreeCubeCoordinates> receivedData;
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
index a46b5a8..ad5e499 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
@@ -496,8 +496,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const
     // now the global leaf labels shall be sent from the processors
     // that own the leaves to the processors that also contain them
     std::map<label, labelLongList> exchangeLabels;
-    std::map<label, LongList<meshOctreeCubeBasic>>::iterator it;
-    for (it = exchangeData.begin(); it!=exchangeData.end(); ++it)
+    forAllIters(exchangeData, it)
     {
         it->second.clear();
         exchangeLabels.insert(std::make_pair(it->first, labelLongList()));
@@ -551,7 +550,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const
         exchangeLabels.insert(std::make_pair(neiProcs[procI], labelLongList()));
     }
 
-    forAllConstIter(Map<label>, globalToLocal, iter)
+    forAllConstIters(globalToLocal, iter)
     {
         const label leafI = iter();
 
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C
index 3200396..ae0dcff 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeInsideOutside/meshOctreeInsideOutside.C
@@ -446,12 +446,7 @@ void meshOctreeInsideOutside::markOutsideCubes()
     } while (keepUpdating);
 
     // set OUTSIDE type to the cubes in OUTSIDE groups
-    for
-    (
-        std::map<label, direction>::const_iterator it = groupType_.begin();
-        it!=groupType_.end();
-        ++it
-    )
+    forAllConstIters(groupType_, it)
     {
         if (it->first < 0)
             continue;
@@ -646,12 +641,7 @@ void meshOctreeInsideOutside::markInsideCubes()
     DynList<label> neighbours;
 
     // make INSIDE groups for which it is possible
-    for
-    (
-        std::map<label, direction>::iterator it = groupType_.begin();
-        it!=groupType_.end();
-        ++it
-    )
+    forAllIters(groupType_, it)
     {
         const label groupI = it->first;
 
@@ -663,11 +653,10 @@ void meshOctreeInsideOutside::markInsideCubes()
             forAllRow(boundaryDATACubes_, groupI, neiI)
             {
                 const label cLabel = boundaryDATACubes_(groupI, neiI);
-                if (
-                    hasOutsideNeighbour_[cLabel] ||
-                    (
-                        leaves[cLabel]->cubeType() & meshOctreeCube::INSIDE
-                    )
+                if
+                (
+                    hasOutsideNeighbour_[cLabel]
+                 || (leaves[cLabel]->cubeType() & meshOctreeCube::INSIDE)
                 )
                 {
                     it->second = meshOctreeCube::INSIDE;
@@ -835,12 +824,7 @@ void meshOctreeInsideOutside::markInsideCubes()
     } while (keepUpdating);
 
     // set INSIDE type to the cubes in INSIDE groups
-    for
-    (
-        std::map<label, direction>::const_iterator it = groupType_.begin();
-        it!=groupType_.end();
-        ++it
-    )
+    forAllConstIters(groupType_, it)
     {
         if (it->first < 0)
             continue;
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
index edd6ff2..60d4454 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
@@ -186,13 +186,10 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
     labelListList sendToProcesssors(Pstream::nProcs());
     sendToProcesssors[Pstream::myProcNo()].setSize(leavesToSend.size());
     label counter(0);
-    for
-    (
-        std::map<label, labelLongList>::const_iterator it = leavesToSend.begin();
-        it!=leavesToSend.end();
-        ++it
-    )
+    forAllConstIters(leavesToSend, it)
+    {
         sendToProcesssors[Pstream::myProcNo()][counter++] = it->first;
+    }
 
     Pstream::gatherList(sendToProcesssors);
     Pstream::scatterList(sendToProcesssors);
@@ -205,14 +202,14 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
 
     // receive coordinates from processors with lower labels
     LongList<meshOctreeCubeBasic> migratedCubes;
-    forAllConstIter(labelHashSet, receiveFrom, iter)
+    for (const label fromi : receiveFrom)
     {
-        if (iter.key() >= Pstream::myProcNo())
+        if (fromi >= Pstream::myProcNo())
             continue;
 
         List<meshOctreeCubeBasic> mc;
 
-        IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key());
+        IPstream fromOtherProc(Pstream::commsTypes::blocking, fromi);
 
         fromOtherProc >> mc;
 
@@ -261,14 +258,14 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
     }
 
     // receive data sent from processors with greater label
-    forAllConstIter(labelHashSet, receiveFrom, iter)
+    for (const label fromi : receiveFrom)
     {
-        if (iter.key() <= Pstream::myProcNo())
+        if (fromi <= Pstream::myProcNo())
             continue;
 
         List<meshOctreeCubeBasic> mc;
 
-        IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key());
+        IPstream fromOtherProc(Pstream::commsTypes::blocking, fromi);
 
         fromOtherProc >> mc;
 
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
index 4454001..d39ca25 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
@@ -243,8 +243,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
             Pout << "Neighbour processors " << neiProcs << endl;
             Pout << "Neighbour range " << neiRange << endl;
 
-            std::map<label, LongList<meshOctreeCubeBasic>>::iterator it;
-            for (it = toProcs.begin(); it!=toProcs.end(); ++it)
+            forAllConstIters(toProcs, it)
             {
                 Pout << "Sending " << it->second.size() << " cubes to proc "
                     << it->first << endl;
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C
index a3b9e2a..68ddbb0 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierRefineSelectedBoxes.C
@@ -621,7 +621,7 @@ void meshOctreeModifier::refineSelectedBoxesAndAdditionalLayers
     }
 
     // refine leaves
-    forAllConstIter(lMap, leavesMap, it)
+    forAllConstIters(leavesMap, it)
     {
         const label nLayers = it->first.second;
         const direction levelI = it->first.first;
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationNormals.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationNormals.C
index e5f11a0..0c707c0 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationNormals.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationNormals.C
@@ -115,7 +115,7 @@ void boundaryLayerOptimisation::calculateNormalVectors
         forAll(neiProcs, i)
             exchangeData[neiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -130,7 +130,8 @@ void boundaryLayerOptimisation::calculateNormalVectors
                     if (neiProc == Pstream::myProcNo())
                         continue;
 
-                    forAllConstIter(patchNormalType, patchNormal, pIt)
+                    forAllConstIters(patchNormal, pIt)
+                    {
                         exchangeData[neiProc].append
                         (
                             refLabelledPointScalar
@@ -144,6 +145,7 @@ void boundaryLayerOptimisation::calculateNormalVectors
                                 )
                             )
                         );
+                    }
                 }
             }
         }
@@ -169,7 +171,7 @@ void boundaryLayerOptimisation::calculateNormalVectors
     # pragma omp parallel
     # pragma omp single nowait
     # endif
-    forAllIter(pointNormalsType, pointPatchNormal, it)
+    forAllIters(pointPatchNormal, it)
     {
         # ifdef USE_OMP
         # pragma omp task firstprivate(it)
@@ -178,7 +180,7 @@ void boundaryLayerOptimisation::calculateNormalVectors
 
         patchNormalType& patchNormal = it->second;
 
-        forAllIter(patchNormalType, patchNormal, pIt)
+        forAllIters(patchNormal, pIt)
         {
             pIt->second.first /= pIt->second.second;
             //pIt->second.first /= (mag(pIt->second.first) + VSMALL);
@@ -444,7 +446,7 @@ void boundaryLayerOptimisation::calculateHairVectorsAtTheBoundary
         forAll(eNeiProcs, i)
             exchangeData[eNeiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -679,7 +681,7 @@ void boundaryLayerOptimisation::optimiseHairNormalsAtTheBoundary()
             forAll(eNeiProcs, i)
                 exchangeData[eNeiProcs[i]].clear();
 
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
@@ -849,7 +851,7 @@ void boundaryLayerOptimisation::optimiseHairNormalsInside()
 
                 label counter(0);
                 const patchNormalType& patchNormals = pointPatchNormal[bpI];
-                forAllConstIter(patchNormalType, patchNormals, pIt)
+                forAllConstIters(patchNormals, pIt)
                 {
                     hv -= pIt->second.first;
                     ++counter;
@@ -1028,9 +1030,11 @@ void boundaryLayerOptimisation::optimiseHairNormalsInside()
 
             std::map<label, LongList<labelledPoint>> exchangeData;
             forAll(eNeiProcs, i)
+            {
                 exchangeData[eNeiProcs[i]].clear();
+            }
 
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationThickness.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationThickness.C
index 2e0d751..07c16a2 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationThickness.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/boundaryLayerOptimisation/boundaryLayerOptimisationThickness.C
@@ -487,7 +487,7 @@ void boundaryLayerOptimisation::optimiseThicknessVariation
             forAll(eNeiProcs, i)
                 exchangeData[eNeiProcs[i]].clear();
 
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C
index fe570a9..2d53737 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C
@@ -148,12 +148,16 @@ void meshOptimizer::calculatePointLocations()
 
     // mark edge vertices
     meshSurfacePartitioner mPart(mse);
-    forAllConstIter(labelHashSet, mPart.edgePoints(), it)
-        vertexLocation_[bPoints[it.key()]] = EDGE;
+    for (const label edgei : mPart.edgePoints())
+    {
+        vertexLocation_[bPoints[edgei]] = EDGE;
+    }
 
     // mark corner vertices
-    forAllConstIter(labelHashSet, mPart.corners(), it)
-        vertexLocation_[bPoints[it.key()]] = CORNER;
+    for (const label corneri : mPart.corners())
+    {
+        vertexLocation_[bPoints[corneri]] = CORNER;
+    }
 
     if (Pstream::parRun())
     {
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
index 770c546..d7dd058 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
@@ -230,9 +230,9 @@ void meshOptimizer::untangleMeshFV
                 const label subsetId =
                     mesh_.addPointSubset(badPointsSubsetName_);
 
-                forAllConstIter(labelHashSet, badFaces, it)
+                for (const label facei : badFaces)
                 {
-                    const face& f = faces[it.key()];
+                    const face& f = faces[facei];
                     forAll(f, pI)
                         mesh_.addPointToSubset(subsetId, f[pI]);
                 }
@@ -292,13 +292,15 @@ void meshOptimizer::untangleMeshFV
         const label badCellsId =
                 mesh_.addCellSubset("badCells");
 
-        forAllConstIter(labelHashSet, badFaces, it)
+        for (const label facei : badFaces)
         {
-            mesh_.addFaceToSubset(subsetId, it.key());
-            mesh_.addCellToSubset(badCellsId, owner[it.key()]);
-            if (neighbour[it.key()] < 0)
+            mesh_.addFaceToSubset(subsetId, facei);
+            mesh_.addCellToSubset(badCellsId, owner[facei]);
+            if (neighbour[facei] < 0)
+            {
                 continue;
-            mesh_.addCellToSubset(badCellsId, neighbour[it.key()]);
+            }
+            mesh_.addCellToSubset(badCellsId, neighbour[facei]);
         }
     }
 
@@ -441,14 +443,16 @@ void meshOptimizer::untangleBoundaryLayer()
             const label badBlCellsId =
                 mesh_.addCellSubset("invalidBoundaryLayerCells");
 
-            forAllConstIter(labelHashSet, badFaces, it)
+            for (const label facei : badFaces)
             {
-                mesh_.addCellToSubset(badBlCellsId, owner[it.key()]);
+                mesh_.addCellToSubset(badBlCellsId, owner[facei]);
 
-                if (neighbour[it.key()] < 0)
+                if (neighbour[facei] < 0)
+                {
                     continue;
+                }
 
-                mesh_.addCellToSubset(badBlCellsId, neighbour[it.key()]);
+                mesh_.addCellToSubset(badBlCellsId, neighbour[facei]);
             }
 
             returnReduce(1, sumOp<label>());
@@ -498,8 +502,10 @@ void meshOptimizer::optimizeLowQualityFaces(const label maxNumIterations)
             );
 
         changedFace = false;
-        forAllConstIter(labelHashSet, lowQualityFaces, it)
-            changedFace[it.key()] = true;
+        for (const label facei : lowQualityFaces)
+        {
+            changedFace[facei] = true;
+        }
 
         Info<< "Iteration " << nIter
             << ". Number of bad faces is " << nBadFaces << endl;
@@ -618,8 +624,10 @@ void meshOptimizer::optimizeMeshFVBestQuality
             );
 
         changedFace = false;
-        forAllConstIter(labelHashSet, lowQualityFaces, it)
-            changedFace[it.key()] = true;
+        for (const label facei : lowQualityFaces)
+        {
+            changedFace[facei] = true;
+        }
 
         Info<< "Iteration " << nIter
             << ". Number of worst quality faces is " << nBadFaces << endl;
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C
index 7fdcb21..e9127a3 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C
@@ -75,7 +75,7 @@ void symmetryPlaneOptimisation::detectSymmetryPlanes()
     {
         // sum up all normals and centres of all processors
         // every symmetry plane patch must be present on all processors
-        forAllIter(mapType, centreSum, pIter)
+        forAllIters(centreSum, pIter)
         {
             std::pair<vector, label>& cs = pIter->second;
             reduce(cs.second, sumOp<label>());
@@ -88,7 +88,7 @@ void symmetryPlaneOptimisation::detectSymmetryPlanes()
     }
 
     // create planes corresponding to each symmetry plane
-    forAllConstIter(mapType, centreSum, it)
+    forAllConstIters(centreSum, it)
     {
         const point c = it->second.first/it->second.second;
 
@@ -156,7 +156,7 @@ bool symmetryPlaneOptimisation::pointInPlanes(VRWGraph& pointInPlanes) const
         forAll(neiProcs, i)
             exchangeData[neiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label pointI = it();
 
@@ -296,8 +296,10 @@ void symmetryPlaneOptimisation::optimizeSymmetryPlanes()
             << "Bad quality or inverted faces found in the mesh" << endl;
 
         const label badFacesId = mesh_.addFaceSubset("invalidFaces");
-        forAllConstIter(labelHashSet, badFaces, it)
-            mesh_.addFaceToSubset(badFacesId, it.key());
+        for (const label facei : badFaces)
+        {
+            mesh_.addFaceToSubset(badFacesId, facei);
+        }
     }
 }
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C
index 1ca9e97..530e335 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/tetMeshOptimisationParallel.C
@@ -316,23 +316,19 @@ void tetMeshOptimisation::unifyCoordinatesParallel
     {
         const labelledPoint& lp = receivedData[i];
 
-        std::map<label, labelledPoint>::iterator iter =
-            parallelBndPoints.find(globalToLocal[lp.pointLabel()]);
+        auto iter = parallelBndPoints.find(globalToLocal[lp.pointLabel()]);
 
         if (iter == parallelBndPoints.end())
+        {
             continue;
+        }
 
         ++iter->second.pointLabel();
         iter->second.coordinates() += lp.coordinates();
     }
 
     // move the point to the averaged position
-    for
-    (
-        std::map<label, labelledPoint>::iterator it = parallelBndPoints.begin();
-        it!=parallelBndPoints.end();
-        ++it
-    )
+    forAllConstIters(parallelBndPoints, it)
     {
         const label pI = it->first;
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C
index 8ed6b65..379953f 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C
@@ -48,12 +48,16 @@ void meshSurfaceOptimizer::classifySurfaceVertices()
     vertexType_ = PARTITION;
 
     // set corners
-    forAllConstIter(labelHashSet, corners, it)
-        vertexType_[it.key()] = CORNER;
+    for (const label corneri : corners)
+    {
+        vertexType_[corneri] = CORNER;
+    }
 
     // set edges
-    forAllConstIter(labelHashSet, edgePoints, it)
-        vertexType_[it.key()] = EDGE;
+    for (const label edgei : edgePoints)
+    {
+        vertexType_[edgei] = EDGE;
+    }
 
     if (Pstream::parRun())
     {
@@ -61,7 +65,7 @@ void meshSurfaceOptimizer::classifySurfaceVertices()
         const Map<label>& globalToLocal =
             surfaceEngine_.globalToLocalBndPointAddressing();
 
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H
index 283053e..3a44629 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H
+++ b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerI.H
@@ -467,7 +467,7 @@ inline void meshSurfaceOptimizer::lockBoundaryFaces(const labelListType& l)
             exchangeData[bpNeiProcs[i]].clear();
 
         //- prepare data which will be sent to other processors
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -523,7 +523,7 @@ inline void meshSurfaceOptimizer::lockBoundaryPoints(const labelListType& l)
             exchangeData[bpNeiProcs[i]].clear();
 
         //- prepare data which will be sent to other processors
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
diff --git a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C
index b45131b..e4479e1 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C
@@ -119,7 +119,7 @@ label meshSurfaceOptimizer::findInvertedVertices
                     std::make_pair(neiProcs[procI], labelLongList())
                 );
 
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label bpI = iter();
 
@@ -446,9 +446,13 @@ bool meshSurfaceOptimizer::untangleSurface
 
             // check if the number of inverted points reduces
             bool minimumInStack(false);
-            forAllConstIter(FIFOStack<label>, nInvertedHistory, it)
+            forAllConstIters(nInvertedHistory, it)
+            {
                 if (it() == minNumInverted)
+                {
                     minimumInStack = true;
+                }
+            }
 
             // stop if the procedure does not minimise
             // the number of inverted points
@@ -806,9 +810,9 @@ void meshSurfaceOptimizer::untangleSurface2D()
         // of active points
         activeBoundaryPoint = false;
         changedFace = false;
-        forAllConstIter(labelHashSet, badFaces, it)
+        for (const label facei : badFaces)
         {
-            const face& f = faces[it.key()];
+            const face& f = faces[facei];
 
             forAll(f, pI)
             {
@@ -834,7 +838,7 @@ void meshSurfaceOptimizer::untangleSurface2D()
                 exchangeData[neiProcs[i]].clear();
 
             // collect active points at inter-processor boundaries
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
diff --git a/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C b/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C
index 96f8744..d670df4 100644
--- a/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C
+++ b/meshLibrary/utilities/smoothers/topology/checkBoundaryFacesSharingTwoEdges/checkBoundaryFacesSharingTwoEdges.C
@@ -174,7 +174,7 @@ void checkBoundaryFacesSharingTwoEdges::findFacesAtBndEdge()
         forAll(bpNei, i)
             exchangeData.insert(std::make_pair(bpNei[i], labelLongList()));
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -225,7 +225,7 @@ void checkBoundaryFacesSharingTwoEdges::findBndFacesAtBndVertex()
         forAll(neiProcs, i)
             exchangeData.insert(std::make_pair(neiProcs[i], labelLongList()));
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
diff --git a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
index 92c68b4..a941444 100644
--- a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
+++ b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
@@ -65,8 +65,10 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
     {
         const Map<label>& globalToLocal = mse.globalToLocalBndPointAddressing();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
+        {
             parallelBndNode[it()] = true;
+        }
     }
 
     // check cells connected to surface nodes
@@ -182,7 +184,6 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
             mesh_.addressingData().globalCellLabel();
 
         std::map<label, DynList<edge>> dualEdgesForPoint;
-        std::map<label, DynList<edge>>::iterator bpIter;
         forAll(parallelBndNode, bpI)
         {
             if (!parallelBndNode[bpI])
@@ -204,7 +205,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
                 if (f[pI] >= origNumVertices)
                     continue;
 
-                bpIter = dualEdgesForPoint.find(bp[f[pI]]);
+                auto bpIter = dualEdgesForPoint.find(bp[f[pI]]);
                 if (bpIter != dualEdgesForPoint.end())
                 {
                     const label cOwn = globalCellLabel[owner[faceI]];
@@ -260,7 +261,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
 
                 forAll(f, pI)
                 {
-                    bpIter = dualEdgesForPoint.find(bp[f[pI]]);
+                    auto bpIter = dualEdgesForPoint.find(bp[f[pI]]);
                     if (bpIter != dualEdgesForPoint.end())
                     {
                         const label cOwn = globalCellLabel[owner[start + i]];
@@ -277,12 +278,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
         const labelList& globalPointLabel = mse.globalBoundaryPointLabel();
         const Map<label>& globalToLocal = mse.globalToLocalBndPointAddressing();
         std::map<label, labelLongList> exchangeData;
-        for
-        (
-            bpIter = dualEdgesForPoint.begin();
-            bpIter!=dualEdgesForPoint.end();
-            ++bpIter
-        )
+        forAllConstIters(dualEdgesForPoint, bpIter)
         {
             const label bpI = bpIter->first;
 
@@ -330,12 +326,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
         {
             if (i == Pstream::myProcNo())
             {
-                for
-                (
-                    bpIter = dualEdgesForPoint.begin();
-                    bpIter!=dualEdgesForPoint.end();
-                    ++bpIter
-                )
+                forAllConstIters(dualEdgesForPoint, bpIter)
                 {
                     const DynList<edge>& pEdges = bpIter->second;
                     Pout<< "Global point label " << globalPointLabel[bpIter->first]
@@ -349,30 +340,22 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices
         # endif
 
         // Finally, check the number of dual loops processor vertices
-        for
-        (
-            bpIter = dualEdgesForPoint.begin();
-            bpIter!=dualEdgesForPoint.end();
-            ++bpIter
-        )
+        forAllConstIters(dualEdgesForPoint, bpIter)
         {
             const DynList<edge>& pEdges = bpIter->second;
             std::map<label, DynList<label>> bpEdges;
             forAll(pEdges, eI)
             {
                 forAll(pEdges[eI], i)
+                {
                     bpEdges[pEdges[eI][i]].append(eI);
+                }
             }
 
             // check if all points can be visited via edges
             counter = 0;
             Map<label> cellGroup(pEdges.size());
-            for
-            (
-                std::map<label, DynList<label>>::iterator it = bpEdges.begin();
-                it!=bpEdges.end();
-                ++it
-            )
+            forAllConstIters(bpEdges, it)
             {
                 if (cellGroup.found(it->first))
                     continue;
@@ -476,6 +459,7 @@ bool checkIrregularSurfaceConnections::checkEdgeFaceConnections
     labelHashSet badEdges;
 
     forAll(edgeFaces, edgeI)
+    {
         if (edgeFaces.sizeOfRow(edgeI) > 2)
         {
             badVertices.insert(edges[edgeI].start());
@@ -483,6 +467,7 @@ bool checkIrregularSurfaceConnections::checkEdgeFaceConnections
 
             badEdges.insert(edgeI);
         }
+    }
 
     if (Pstream::parRun())
     {
@@ -620,8 +605,10 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
     {
         const Map<label>& globalToLocal = mse.globalToLocalBndPointAddressing();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
+        {
             parallelBndPoint[it()] = true;
+        }
     }
 
     // check number of face groups
@@ -708,9 +695,9 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
         const Map<label>& otherFaceAtProc = mse.otherEdgeFaceAtProc();
         const DynList<label>& beNeiProcs = mse.beNeiProcs();
 
-        // create map of dual edges for boundary points at processor boundaries
+        // map of dual edges for boundary points at processor boundaries
         std::map<label, DynList<edge>> dualEdgesForPoint;
-        std::map<label, DynList<edge>>::iterator bpIter;
+
         forAll(parallelBndPoint, bpI)
         {
             if (!parallelBndPoint[bpI])
@@ -740,8 +727,10 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
         // collect connections over processor edges on the processor with
         // the lowest label to avoid duplication of data
         forAll(beNeiProcs, i)
+        {
             exchangeData.insert(std::make_pair(beNeiProcs[i], labelLongList()));
-        forAllConstIter(Map<label>, otherFaceAtProc, it)
+        }
+        forAllConstIters(otherFaceAtProc, it)
         {
             const label beI = it.key();
 
@@ -777,12 +766,7 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
         // exchange data with other processors
         // this step supplies all processors with all necessary data
         exchangeData.clear();
-        for
-        (
-            bpIter = dualEdgesForPoint.begin();
-            bpIter!=dualEdgesForPoint.end();
-            ++bpIter
-        )
+        forAllConstIters(dualEdgesForPoint, bpIter)
         {
             const label bpI = bpIter->first;
 
@@ -829,12 +813,7 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
         {
             if (i == Pstream::myProcNo())
             {
-                for
-                (
-                    bpIter = dualEdgesForPoint.begin();
-                    bpIter!=dualEdgesForPoint.end();
-                    ++bpIter
-                )
+                forAllConstIters(dualEdgesForPoint, bpIter)
                 {
                     const DynList<edge>& pEdges = bpIter->second;
                     Pout << "Global point label "
@@ -848,12 +827,7 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
         # endif
 
         // Finally, check the number of dual loops processor vertices
-        for
-        (
-            bpIter = dualEdgesForPoint.begin();
-            bpIter!=dualEdgesForPoint.end();
-            ++bpIter
-        )
+        forAllConstIters(dualEdgesForPoint, bpIter)
         {
             const DynList<edge>& pEdges = bpIter->second;
 
@@ -867,12 +841,7 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
             // check if all points can be visited via edges
             counter = 0;
             Map<label> cellGroup(pEdges.size());
-            for
-            (
-                std::map<label, DynList<label>>::iterator it = bpEdges.begin();
-                it!=bpEdges.end();
-                ++it
-            )
+            forAllConstIters(bpEdges, it)
             {
                 if (cellGroup.found(it->first))
                     continue;
@@ -921,10 +890,12 @@ bool checkIrregularSurfaceConnections::checkFaceGroupsAtBndVertices
 
         boolList removeCell(mesh_.cells().size(), false);
 
-        forAllConstIter(labelHashSet, invalidVertices, it)
+        for (const label verti : invalidVertices)
         {
-            forAllRow(pointCells, it.key(), pcI)
-                removeCell[pointCells(it.key(), pcI)] = true;
+            forAllRow(pointCells, verti, pcI)
+            {
+                removeCell[pointCells(verti, pcI)] = true;
+            }
         }
 
         polyMeshGenModifier(mesh_).removeCells(removeCell);
diff --git a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
index 7110562..9f7f0b0 100644
--- a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
+++ b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
@@ -309,8 +309,10 @@ bool checkNonMappableCellConnections::removeCells()
         if (nRemoved != 0)
         {
             boolList removeCell(mesh_.cells().size(), false);
-            forAllConstIter(labelHashSet, badCells, it)
-                removeCell[it.key()] = true;
+            for (const label celli : badCells)
+            {
+                removeCell[celli] = true;
+            }
 
             polyMeshGenModifier(mesh_).removeCells(removeCell);
 
diff --git a/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C b/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C
index 1c6adc2..8f78e1b 100644
--- a/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C
+++ b/meshLibrary/utilities/surfaceTools/correctEdgesBetweenPatches/correctEdgesBetweenPatchesDistributeFaces.C
@@ -78,7 +78,7 @@ void correctEdgesBetweenPatches::decomposeProblematicFaces()
             mse.globalToLocalBndEdgeAddressing();
         const VRWGraph& beAtProcs = mse.beAtProcs();
         const Map<label>& otherProcPatch = mse.otherEdgeFacePatch();
-        forAllConstIter(Map<label>, globalToLocalEdge, it)
+        forAllConstIters(globalToLocalEdge, it)
         {
             const label beI = it();
 
@@ -98,7 +98,7 @@ void correctEdgesBetweenPatches::decomposeProblematicFaces()
 
         // append labels of feature edges that need to be sent to other
         // processors sharing that edge
-        forAllConstIter(Map<label>, globalToLocalEdge, it)
+        forAllConstIters(globalToLocalEdge, it)
         {
             const label beI = it();
 
@@ -317,7 +317,7 @@ void correctEdgesBetweenPatches::decomposeConcaveFaces()
         forAll(mse.beNeiProcs(), i)
             exchangeData[mse.beNeiProcs()[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -454,13 +454,17 @@ void correctEdgesBetweenPatches::patchCorrection()
 
     // set corner flags
     const labelHashSet& corners = surfacePartitioner.corners();
-    forAllConstIter(labelHashSet, corners, it)
-        nodeType[it.key()] |= 1;
+    for (const label corneri : corners)
+    {
+        nodeType[corneri] |= 1;
+    }
 
     // set flgs to edge vertices
     const labelHashSet& edgePoints = surfacePartitioner.edgePoints();
-    forAllConstIter(labelHashSet, edgePoints, it)
-        nodeType[it.key()] |= 2;
+    for (const label pointi : edgePoints)
+    {
+        nodeType[pointi] |= 2;
+    }
 
     // set flags for feature edges
     boolList featureEdge(edgeFaces.size(), false);
@@ -482,9 +486,13 @@ void correctEdgesBetweenPatches::patchCorrection()
         // set flags for edges at parallel boundaries
         const Map<label>& otherProcPatch = mse.otherEdgeFacePatch();
 
-        forAllConstIter(Map<label>, otherProcPatch, it)
+        forAllConstIters(otherProcPatch, it)
+        {
             if (facePatches[edgeFaces(it.key(), 0)] != it())
+            {
                 featureEdge[it.key()] = true;
+            }
+        }
     }
 
     // decompose bad faces into triangles
diff --git a/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
index 3ddb0ff..d53d491 100644
--- a/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
+++ b/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
@@ -87,7 +87,7 @@ void edgeExtractor::calculateValence()
                 std::make_pair(bpNeiProcs[i], LongList<labelPair>())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
@@ -361,7 +361,7 @@ void edgeExtractor::markPatchPoints(boolList& patchPoint)
                 std::make_pair(neiProcs[procI], labelLongList())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -626,7 +626,7 @@ void edgeExtractor::findOtherFacePatchesParallel
                 std::make_pair(neiProcs[procI], labelLongList())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -782,7 +782,7 @@ void edgeExtractor::moveVerticesTowardsDiscontinuities(const label nIterations)
             forAll(neiProcs, i)
                 exchangeData[i] = LongList<refLabelledPoint>();
 
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label bpI = iter();
 
@@ -1756,7 +1756,7 @@ bool edgeExtractor::checkFacePatchesTopology()
 
             newPatch = -1;
             label nNeiEdges(0);
-            forAllConstIter(Map<label>, nNeiInPatch, it)
+            forAllConstIters(nNeiInPatch, it)
             {
                 if (it() > nNeiEdges)
                 {
@@ -1881,7 +1881,7 @@ class featureEdgesNeiOp
                     exchangeData[neiProcs[i]].clear();
 
                 // fill the data from sending
-                forAllConstIter(Map<label>, globalToLocal, it)
+                forAllConstIters(globalToLocal, it)
                 {
                     const label bpI = it();
 
@@ -1991,7 +1991,7 @@ public:
         forAll(neiProcs, i)
             exchangeData[neiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -2134,10 +2134,10 @@ bool edgeExtractor::checkFacePatchesGeometry()
         // untangle the surface
         activePointLabel.clear();
         activePoints = false;
-        forAllConstIter(labelHashSet, invertedPoints, it)
+        for (const label pointi : invertedPoints)
         {
-            activePointLabel.append(bp[it.key()]);
-            activePoints[bp[it.key()]] = true;
+            activePointLabel.append(bp[pointi]);
+            activePoints[bp[pointi]] = true;
         }
 
         // untangle the surface
@@ -2294,7 +2294,7 @@ void edgeExtractor::projectDeterminedFeatureVertices()
             );
 
         // collect the data distributed to others
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
diff --git a/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C b/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
index 0799f61..b888467 100644
--- a/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
+++ b/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractorCorners.C
@@ -75,7 +75,7 @@ void edgeExtractor::faceEvaluator::calculateNeiPatchesParallel()
                 std::make_pair(neiProcs[procI], labelLongList())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -136,7 +136,7 @@ void edgeExtractor::faceEvaluator::calculateNeiPatchesParallelNewPatches()
                 std::make_pair(neiProcs[procI], labelLongList())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -285,7 +285,7 @@ label edgeExtractor::faceEvaluator::bestPatchTopological
 
     label newPatch = -1;
     label nNeiEdges(0);
-    forAllConstIter(Map<label>, nNeiInPatch, it)
+    forAllConstIters(nNeiInPatch, it)
     {
         if (it() > nNeiEdges)
         {
@@ -478,7 +478,7 @@ void edgeExtractor::cornerEvaluator::createParallelAddressing()
     faceAtProc_.clear();
     facePatches_.clear();
 
-    forAllConstIter(mapType, globalToLocal, it)
+    forAllConstIters(globalToLocal, it)
     {
         const label bpI = it();
 
@@ -539,17 +539,12 @@ void edgeExtractor::cornerEvaluator::createParallelAddressing()
     std::map<label, List<labelledPoint>> receivedDataMap;
     help::exchangeMap(exchangeData, receivedDataMap);
 
-    for
-    (
-        std::map<label, List<labelledPoint>>::const_iterator it = receivedDataMap.begin();
-        it!=receivedDataMap.end();
-        ++it
-    )
+    forAllConstIters(receivedDataMap, it)
     {
         const label procI = it->first;
         const List<labelledPoint>& receivedData = it->second;
 
-        for (label i = 0; i < receivedData.size(); )
+        for (label i = 0; i < receivedData.size(); /*nil*/ )
         {
             const label bpI = globalToLocal[receivedData[i++].pointLabel()];
 
@@ -562,7 +557,9 @@ void edgeExtractor::cornerEvaluator::createParallelAddressing()
 
                 DynList<labelledPoint> lpf(size);
                 forAll(lpf, pI)
+                {
                     lpf[pI] = receivedData[i++];
+                }
 
                 faceMap_[bpI].append(lpf);
                 faceAtProc_[bpI].append(procI);
@@ -571,13 +568,8 @@ void edgeExtractor::cornerEvaluator::createParallelAddressing()
         }
     }
 
-    // srot the faces in the counter-clockwise order
-    for
-    (
-        std::map<label, DynList<label>>::iterator it = faceAtProc_.begin();
-        it!=faceAtProc_.end();
-        ++it
-    )
+    // sort the faces in the counter-clockwise order
+    forAllIters(faceAtProc_, it)
     {
         const label bpI = it->first;
 
@@ -591,11 +583,13 @@ void edgeExtractor::cornerEvaluator::createParallelAddressing()
 
             label pos(-1);
             forAll(lpf, pI)
+            {
                 if (lpf[i].pointLabel() == globalLabel[bpI])
                 {
                     pos = pI;
                     break;
                 }
+            }
 
             for (label j = i + 2; j < pFaces.size(); ++j)
             {
@@ -696,19 +690,19 @@ void edgeExtractor::cornerEvaluator::improveCorners
     const pointFieldPMG& points = mse.points();
     const faceList::subList& bFaces = mse.boundaryFaces();
 
-    forAllConstIter(labelHashSet, corners, it)
+    for (const label corneri : corners)
     {
-        const point& p = points[bPoints[it.key()]];
+        const point& p = points[bPoints[corneri]];
 
-        if (faceMap_.find(it.key()) == faceMap_.end())
+        if (faceMap_.find(corneri) == faceMap_.end())
         {
             const labelList& facePatch = extractor_.facePatch_;
-            Info<< "Checking corner " << it.key() << endl;
+            Info<< "Checking corner " << corneri << endl;
 
             // get faces attached to this point
             // sorted in the counter-clocwise order
             DynList<label> pFaces;
-            sortedFacesAtPoint(it.key(), pFaces);
+            sortedFacesAtPoint(corneri, pFaces);
 
             Info<< "Faces at corner " << pFaces << endl;
 
@@ -752,7 +746,7 @@ void edgeExtractor::cornerEvaluator::improveCorners
                 {
                     const face& bf = bFaces[pFaces[pfI]];
 
-                    const label pos = bf.which(bPoints[it.key()]);
+                    const label pos = bf.which(bPoints[corneri]);
 
                     const point& pe = points[bf[bf.rcIndex(pos)]];
 
@@ -782,7 +776,7 @@ void edgeExtractor::cornerEvaluator::improveCorners
                 bestEdgeIndices[i] = bestEdgeIndex;
             }
 
-            Info<< "\nPatches of edges at corner " << it.key()
+            Info<< "\nPatches of edges at corner " << corneri
                 << " are " << edgePatches << endl;
             Info<< "Orig edge indices " << edgeIndex << endl;
             Info<< "New edge indices " << bestEdgeIndices << endl;
@@ -884,7 +878,7 @@ bool edgeExtractor::findCornerCandidates()
                 std::make_pair(bpNeiProcs[i], LongList<labelledScalar>())
             );
 
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
@@ -1029,9 +1023,8 @@ bool edgeExtractor::checkCorners()
         # endif
 
         // find nearest corners in the surface mesh
-        forAllConstIter(labelHashSet, corners, it)
+        for (const label bpI : corners)
         {
-            const label bpI = it.key();
             const DynList<label> neiPatches = pPatches[bpI];
 
             const point& p = points[bPoints[bpI]];
@@ -1050,7 +1043,7 @@ bool edgeExtractor::checkCorners()
         }
 
         std::map<label, DynList<label>> bpMappedAtSurfaceCorner;
-        forAllConstIter(mapType, cornerIndex, mIt)
+        forAllConstIters(cornerIndex, mIt)
         {
             if (mIt->second < 0)
             {
@@ -1066,15 +1059,14 @@ bool edgeExtractor::checkCorners()
         }
 
         # ifdef DEBUGEdgeExtractor
-        for
-        (
-            mapType::const_iterator mIt = bpMappedAtSurfaceCorner.begin();
-            mIt!=bpMappedAtSurfaceCorner.end();
-            ++mIt
-        )
+        forAllConstIters(bpMappedAtSurfaceCorner, mIt)
+        {
             if (mIt->second.size() > 1)
+            {
                 Info<< "Surface corner " << mIt->first
-                     << " mapped mesh points " << mIt->second << endl;
+                    << " mapped mesh points " << mIt->second << endl;
+            }
+        }
         # endif
 
         // for all edge nodes find their nearest counterparts in the surface
@@ -1088,10 +1080,8 @@ bool edgeExtractor::checkCorners()
         mapType edgePointIndex;
         std::map<std::pair<label, label>, labelLongList> edgesSharedByPatches;
 
-        forAllConstIter(labelHashSet, featureEdge, it)
+        for (const label beI : featureEdge)
         {
-            const label beI = it.key();
-
             // get the patches bounded by this feature edge
             DynList<label> patches(2);
 
@@ -1153,12 +1143,7 @@ bool edgeExtractor::checkCorners()
         }
 
         labelHashSet invalidFeatureEdges;
-        for
-        (
-            std::map<std::pair<label, label>, labelLongList>::const_iterator mIt = edgesSharedByPatches.begin();
-            mIt!=edgesSharedByPatches.end();
-            ++mIt
-        )
+        forAllConstIters(edgesSharedByPatches, mIt)
         {
             const bool validConnection =
                 patchPatches[mIt->first.first].found(mIt->first.second);
@@ -1191,7 +1176,7 @@ bool edgeExtractor::checkCorners()
         // check the vicinity of the corner point and check whether
         // it shall be replaced by some other point in the vicinity
         std::map<label, DynList<labelPair>> facesAtCornerNewPatches;
-        forAllConstIter(distMapType, nearestToCorner, it)
+        forAllConstIters(nearestToCorner, it)
         {
             const label bpI = it->first;
 
@@ -1211,11 +1196,11 @@ bool edgeExtractor::checkCorners()
             }
 
             # ifdef DEBUGEdgeExtractor
-            forAllConstIter(labelHashSet, nearPoints, iterN)
+            for (const label pointi : nearPoints)
             {
-                Info<< "Near point " << iterN.key() << endl;
+                Info<< "Near point " << pointi << endl;
                 Info<< "Faces containing near point are "
-                     << facesContainingPoint[iterN.key()] << endl;
+                     << facesContainingPoint[pointi] << endl;
             }
             # endif
 
@@ -1223,16 +1208,16 @@ bool edgeExtractor::checkCorners()
             // shall be mapped onto the surface mesh
             label bestPoint(-1);
             scalar minDistSq(VGREAT);
-            forAllConstIter(labelHashSet, nearPoints, iter)
+            for (const label pointi : nearPoints)
             {
-                const point& p = points[iter.key()];
+                const point& p = points[pointi];
 
                 const scalar dSq = magSqr(p - nearestToCorner[bpI].first);
 
                 if (dSq < minDistSq)
                 {
                     minDistSq = dSq;
-                    bestPoint = iter.key();
+                    bestPoint = pointi;
                 }
             }
 
@@ -1769,8 +1754,7 @@ bool edgeExtractor::checkCorners()
         }
 
         labelHashSet changedPatch;
-        typedef std::map<label, DynList<labelPair>> labelToPairMap;
-        forAllConstIter(labelToPairMap, facesAtCornerNewPatches, it)
+        forAllConstIters(facesAtCornerNewPatches, it)
         {
             const DynList<labelPair>& lp = it->second;
             forAll(lp, i)
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C b/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C
index 167aa3e..84049e5 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C
@@ -63,8 +63,10 @@ void meshSurfaceCheckEdgeTypes::classifyEdges()
     meshSurfacePartitioner mPart(surfaceEngine_);
     meshSurfaceCheckInvertedVertices checkInverted(mPart);
     const labelHashSet& invertedPoints = checkInverted.invertedVertices();
-    forAllConstIter(labelHashSet, invertedPoints, it)
-        problematicPoint[bp[it.key()]] = true;
+    for (const label pointi : invertedPoints)
+    {
+        problematicPoint[bp[pointi]] = true;
+    }
 
     // classify edges
     edgeType_.setSize(edges.size());
@@ -172,9 +174,9 @@ void meshSurfaceCheckEdgeTypes::classifyEdges()
             );
         }
 
-        forAllConstIter(Map<label>, otherPatch, eIter)
+        forAllConstIters(otherPatch, eIter)
         {
-            if (eIter() == facePatch[edgeFaces(eIter.key(), 0)] )
+            if (eIter() == facePatch[edgeFaces(eIter.key(), 0)])
             {
                 edgeType_[eIter()] |= PATCHEDGE;
             }
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C b/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C
index 4737cd5..eddc2e9 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.C
@@ -63,10 +63,8 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
     typedef std::map<label, ltvMap> lltvMap;
     lltvMap pointPatchNormal;
 
-    forAllConstIter(labelHashSet, corners, it)
+    for (const label bpI : corners)
     {
-        const label bpI = it.key();
-
         if (activePointsPtr_ && !activePointsPtr_->operator[](bpI))
             continue;
 
@@ -88,10 +86,8 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
         }
     }
 
-    forAllConstIter(labelHashSet, edgePoints, it)
+    for (const label bpI : edgePoints)
     {
-        const label bpI = it.key();
-
         if (activePointsPtr_ && !activePointsPtr_->operator[](bpI))
             continue;
 
@@ -123,7 +119,7 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
         forAll(neiProcs, i)
             exchangeData[neiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -138,7 +134,8 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
                     if (neiProc == Pstream::myProcNo())
                         continue;
 
-                    forAllConstIter(ltvMap, patchNormal, pIt)
+                    forAllConstIters(patchNormal, pIt)
+                    {
                         exchangeData[neiProc].append
                         (
                             refLabelledPoint
@@ -147,6 +144,7 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
                                 labelledPoint(pIt->first, pIt->second)
                             )
                         );
+                    }
                 }
             }
         }
@@ -166,11 +164,11 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
         }
     }
 
-    forAllIter(lltvMap, pointPatchNormal, it)
+    forAllIters(pointPatchNormal, it)
     {
-        ltvMap& patchNormal = pointPatchNormal[it->first];
+        auto& patchNormal = pointPatchNormal[it->first];
 
-        forAllIter(ltvMap, patchNormal, pIt)
+        forAllIters(patchNormal, pIt)
         {
             const scalar magv = mag(pIt->second) + VSMALL;
 
@@ -369,9 +367,11 @@ void meshSurfaceCheckInvertedVertices::checkVertices()
 
         std::map<label, labelLongList> shareData;
         forAll(neiProcs, i)
+        {
             shareData.insert(std::make_pair(neiProcs[i], labelLongList()));
+        }
 
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
index 9a236f2..8bbf657 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
@@ -581,7 +581,7 @@ void meshSurfaceEngine::calculatePointPatches() const
 
         std::map<label, labelLongList> exchangeData;
 
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
@@ -729,7 +729,7 @@ void meshSurfaceEngine::calculatePointPoints() const
         const VRWGraph& bpAtProcs = this->bpAtProcs();
 
         std::map<label, labelLongList> exchangeData;
-        forAllConstIter(Map<label>, globalToLocal, iter)
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
 
@@ -884,7 +884,7 @@ void meshSurfaceEngine::updatePointNormalsAtProcBoundaries() const
     // create data which will be sent to other processors
     std::map<label, LongList<labelledPoint>> exchangeData;
 
-    forAllConstIter(Map<label>, globalToLocal, iter)
+    forAllConstIters(globalToLocal, iter)
     {
         const label bpI = iter();
 
@@ -1019,8 +1019,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const
                 }
             }
 
-            std::set<std::pair<label, label>>::const_iterator it;
-            for (it = edgesAtPoint.begin(); it!=edgesAtPoint.end(); ++it)
+            forAllConstIters(edgesAtPoint, it)
             {
                 edgesHelper.append(edge(it->first, it->second));
             }
@@ -1386,7 +1385,7 @@ void meshSurfaceEngine::calculateEdgePatchesAddressing() const
         const Map<label>& globalToLocal = globalToLocalBndEdgeAddressing();
         const Map<label>& otherPatch = this->otherEdgeFacePatch();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C
index eb54878..0e8ce51 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineModifier.C
@@ -168,8 +168,10 @@ void meshSurfaceEngineModifier::syncVerticesAtParallelBoundaries()
     const Map<label>& globalToLocal =
         surfaceEngine_.globalToLocalBndPointAddressing();
     labelLongList syncNodes;
-    forAllConstIter(Map<label>, globalToLocal, it)
+    forAllConstIters(globalToLocal, it)
+    {
         syncNodes.append(it());
+    }
 
     syncVerticesAtParallelBoundaries(syncNodes);
 }
@@ -346,7 +348,7 @@ void meshSurfaceEngineModifier::updateGeometry
             forAll(neiProcs, i)
                 exchangeNodeLabels[neiProcs[i]].clear();
 
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
@@ -377,7 +379,7 @@ void meshSurfaceEngineModifier::updateGeometry
                 exchangeData[neiProcs[i]].clear();
 
             // prepare data for sending
-            forAllConstIter(Map<label>, globalToLocal, iter)
+            forAllConstIters(globalToLocal, iter)
             {
                 const label bpI = iter();
 
@@ -411,7 +413,7 @@ void meshSurfaceEngineModifier::updateGeometry
             }
 
             // normalize vectors
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
index ea58751..d2dfff7 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
@@ -410,10 +410,8 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
             const procEdgeMap& procBndEdges = facesWithProcBndEdges[patchI];
 
             labelLongList dts;
-            forAllConstIter(procEdgeMap, procBndEdges, it)
+            for (const std::pair<label,label>& fPair : procBndEdges)
             {
-                const std::pair<label, label>& fPair = *it;
-
                 const face& f = faces[fPair.first];
                 const edge e = f.faceEdge(fPair.second);
 
@@ -548,7 +546,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
             const procEdgeMap& procBndEdges = facesWithProcBndEdges[patchI];
 
             labelLongList dts;
-            forAllConstIter(procEdgeMap, procBndEdges, it)
+            forAllConstIters(procBndEdges, it)
             {
                 const label faceI = it->first;
                 const face& f = faces[faceI];
@@ -667,7 +665,7 @@ void meshSurfaceEngine::calcAddressingForProcEdges() const
 
     // check if it the surface is manifold over inter-processor edges
     Map<label> nFacesAtEdge;
-    forAllConstIter(Map<label>, globalToLocal, iter)
+    forAllConstIters(globalToLocal, iter)
     {
         const label beI = iter();
         nFacesAtEdge.insert(beI, eFaces.sizeOfRow(beI));
@@ -693,7 +691,7 @@ void meshSurfaceEngine::calcAddressingForProcEdges() const
         nFacesAtEdge[beI] += receivedData[counter++];
     }
 
-    forAllConstIter(Map<label>, nFacesAtEdge, iter)
+    forAllConstIters(nFacesAtEdge, iter)
     {
         if (iter() != 2)
             FatalErrorInFunction
@@ -707,7 +705,7 @@ void meshSurfaceEngine::calcAddressingForProcEdges() const
     forAll(beNeiProcs, i)
         exchangeData.insert(std::make_pair(beNeiProcs[i], labelLongList()));
 
-    forAllConstIter(Map<label>, globalToLocal, iter)
+    forAllConstIters(globalToLocal, iter)
     {
         const label beI = iter();
 
@@ -738,12 +736,8 @@ void meshSurfaceEngine::calcAddressingForProcEdges() const
     otherEdgeFacePatchPtr_ = new Map<label>();
     Map<label>& otherProcPatches = *otherEdgeFacePatchPtr_;
     Map<label>& otherFaceProc = *otherEdgeFaceAtProcPtr_;
-    for
-    (
-        std::map<label, labelList>::const_iterator iter = receivedMap.begin();
-        iter!=receivedMap.end();
-        ++iter
-    )
+
+    forAllConstIters(receivedMap, iter)
     {
         const labelList& receivedData = iter->second;
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C
index 1ee252f..0646893 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperCornersAndEdges.C
@@ -434,15 +434,19 @@ void meshSurfaceMapper::mapCornersAndEdges()
     const meshSurfacePartitioner& mPart = meshPartitioner();
     const labelHashSet& cornerPoints = mPart.corners();
     labelLongList selectedPoints;
-    forAllConstIter(labelHashSet, cornerPoints, it)
-        selectedPoints.append(it.key());
+    for (const label it : cornerPoints)
+    {
+        selectedPoints.append(it);
+    }
 
     mapCorners(selectedPoints);
 
     selectedPoints.clear();
     const labelHashSet& edgePoints = mPart.edgePoints();
-    forAllConstIter(labelHashSet, edgePoints, it)
-        selectedPoints.append(it.key());
+    for (const label it : edgePoints)
+    {
+        selectedPoints.append(it);
+    }
 
     mapEdgeNodes(selectedPoints);
 }
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C
index 7962930..3139c56 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper/meshSurfaceMapperPremapVertices.C
@@ -186,7 +186,7 @@ void meshSurfaceMapper::preMapVertices(const label nIterations)
                     )
                 );
 
-            forAllConstIter(Map<label>, globalToLocal, it)
+            forAllConstIters(globalToLocal, it)
             {
                 const label bpI = it();
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C
index a238826..bee16e6 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2D.C
@@ -78,7 +78,7 @@ void meshSurfaceMapper2D::findActiveBoundaryEdges()
         forAll(neiProcs, i)
                 exchangeData[neiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C b/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C
index d6bf1c8..9bbc1c6 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfacePartitioner/meshSurfacePartitionerFunctions.C
@@ -108,7 +108,7 @@ void meshSurfacePartitioner::calculateCornersEdgesAndAddressing()
         forAll(beNeiProcs, i)
             exchangeData.insert(std::make_pair(beNeiProcs[i], labelLongList()));
 
-        forAllConstIter(Map<label>, globalToLocalEdges, it)
+        forAllConstIters(globalToLocalEdges, it)
         {
             const label beI = it();
 
@@ -133,7 +133,7 @@ void meshSurfacePartitioner::calculateCornersEdgesAndAddressing()
         }
 
         // take into account feature edges at processor boundaries
-        forAllConstIter(Map<label>, otherFaceAtProc, it)
+        forAllConstIters(otherFaceAtProc, it)
         {
             const label beI = it.key();
 
@@ -156,7 +156,7 @@ void meshSurfacePartitioner::calculateCornersEdgesAndAddressing()
         const Map<label>& globalToLocal =
             meshSurface_.globalToLocalBndPointAddressing();
         const VRWGraph& bpAtProcs = meshSurface_.bpAtProcs();
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
@@ -224,7 +224,7 @@ void meshSurfacePartitioner::calculateCornersEdgesAndAddressing()
         forAll(bpNeiProcs, i)
             exchangeData[bpNeiProcs[i]].clear();
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label bpI = it();
 
diff --git a/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C b/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C
index 8605cde..82bfa63 100644
--- a/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C
+++ b/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicates/triSurfaceCleanupDuplicatesFunctions.C
@@ -141,23 +141,17 @@ bool triSurfaceCleanupDuplicates::mergeDuplicatePoints()
                 const labelledTri& tri = surf_[triI];
 
                 forAll(tri, i)
+                {
                     points.insert(tri[i]);
+                }
             }
 
-            for
-            (
-                std::set<label>::const_iterator it = points.begin();
-                it!=points.end();
-            )
+            for (auto it = points.cbegin(); it != points.cend(); /*nil*/)
             {
                 const label pointI = *it;
 
-                for
-                (
-                    std::set<label>::const_iterator nIt=++it;
-                    nIt!=points.end();
-                    ++nIt
-                )
+                for (auto nIt = ++it; nIt != points.cend(); ++nIt)
+                {
                     if (magSqr(pts[pointI] - pts[*nIt]) < sqr(tolerance_))
                     {
                         foundDuplicates = true;
@@ -166,6 +160,7 @@ bool triSurfaceCleanupDuplicates::mergeDuplicatePoints()
                         # endif
                         newPointLabel[*nIt] = pointI;
                     }
+                }
             }
         }
     }
@@ -177,6 +172,7 @@ bool triSurfaceCleanupDuplicates::mergeDuplicatePoints()
     // remove vertices and update node labels
     label counter(0);
     forAll(pts, pI)
+    {
         if (newPointLabel[pI] == pI)
         {
             newPointLabel[pI] = counter;
@@ -189,6 +185,7 @@ bool triSurfaceCleanupDuplicates::mergeDuplicatePoints()
             const label origI = newPointLabel[pI];
             newPointLabel[pI] = newPointLabel[origI];
         }
+    }
 
     Info<< "Found " << (pts.size() - counter) << "duplicate points" << endl;
 
diff --git a/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C b/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C
index c27fefe..f0be749 100644
--- a/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C
+++ b/meshLibrary/utilities/triSurfaceTools/triSurfaceCurvatureEstimator/triSurfaceCurvatureEstimatorCalculate.C
@@ -111,18 +111,15 @@ void writeSurfaceToVTK
         }
     }
 
-    forAllConstIter(labelHashSet, labels, it)
-        newPointLabel[it.key()];
+    for (const label it : labels)
+    {
+        newPointLabel[it];
+    }
 
     const pointField& points = surf.points();
     file << "POINTS " << label(newPointLabel.size()) << " float\n";
     label counter(0);
-    for
-    (
-        std::map<label, label>::iterator it = newPointLabel.begin();
-        it!=newPointLabel.end();
-        ++it
-    )
+    forAllIters(newPointLabel, it)
     {
         it->second = counter++;
 
@@ -351,7 +348,7 @@ void triSurfaceCurvatureEstimator::calculateSurfaceCurvatures()
             }
         }
 
-        forAllConstIter(Map<labelHashSet>, otherLabels, it)
+        forAllConstIters(otherLabels, it)
         {
             const labelHashSet& currLabels = it();
 
@@ -359,9 +356,8 @@ void triSurfaceCurvatureEstimator::calculateSurfaceCurvatures()
                 continue;
 
             labelHashSet additionalPoints;
-            forAllConstIter(labelHashSet, currLabels, lit)
+            for (const label neiPointI : currLabels)
             {
-                const label neiPointI = lit.key();
                 const constRow pTriangles = pointTriangles[neiPointI];
 
                 forAll(pTriangles, ptI)
@@ -376,14 +372,18 @@ void triSurfaceCurvatureEstimator::calculateSurfaceCurvatures()
                 }
             }
 
-            forAllConstIter(labelHashSet, additionalPoints, aIter)
-                otherLabels[it.key()].insert(aIter.key());
+            for (const label aIter : additionalPoints)
+            {
+                otherLabels[it.key()].insert(aIter);
+            }
         }
 
-        forAllIter(Map<vector>, normals, nit)
+        forAllIters(normals, nit)
+        {
             nit() /= (Foam::mag(nit()) + VSMALL);
+        }
 
-        forAllConstIter(Map<labelHashSet>, otherLabels, it)
+        forAllConstIters(otherLabels, it)
         {
             const labelHashSet& labels = it();
 
@@ -412,8 +412,10 @@ void triSurfaceCurvatureEstimator::calculateSurfaceCurvatures()
             // store point coordinates
             DynList<point> op;
 
-            forAllConstIter(labelHashSet, labels, lit)
-                op.append(points[lit.key()]);
+            for (const label lit : labels)
+            {
+                op.append(points[lit]);
+            }
 
             // fit the quadric patch to the surface
             quadricFitting qfit(points[pointI], normals[it.key()], op);
@@ -800,7 +802,7 @@ void triSurfaceCurvatureEstimator::calculateMeanCurvature()
         std::map<label, scalar>& mc = meanCurvature_[patchI];
         Map<label>& nn = nNeighbours[patchI];
 
-        forAllIter(Map<label>, nn, it)
+        forAllIters(nn, it)
         {
             if (it() == 0)
             {
diff --git a/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C b/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C
index bd191c3..7b3744d 100644
--- a/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C
+++ b/meshLibrary/utilities/triSurfaceTools/triSurfacePartitioner/triSurfacePartitioner.C
@@ -113,8 +113,10 @@ void triSurfacePartitioner::edgeGroupsSharedByPatches
     {
         const labelHashSet& eGroups = it->second;
 
-        forAllConstIter(labelHashSet, eGroups, it)
-            edgeGroups.append(it.key());
+        for (const label groupi : eGroups)
+        {
+            edgeGroups.append(groupi);
+        }
     }
 }
 
@@ -134,15 +136,16 @@ void triSurfacePartitioner::cornersSharedByEdgeGroups
         Foam::max(edgeGroup1, edgeGroup2)
     );
 
-    std::map<std::pair<label, label>, labelHashSet>::const_iterator it =
-        edgeGroupsCorners_.find(ep);
+    auto it = edgeGroupsCorners_.find(ep);
 
     if (it != edgeGroupsCorners_.end())
     {
         const labelHashSet& corn = it->second;
 
-        forAllConstIter(labelHashSet, corn, it)
-            corners.append(it.key());
+        for (const label corni : corn)
+        {
+            corners.append(corni);
+        }
     }
 }
 
diff --git a/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C b/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C
index 5fb9eaf..89aaca9 100644
--- a/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C
+++ b/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.C
@@ -237,8 +237,10 @@ const triSurf* triSurfacePatchManipulator::surfaceWithPatches
 
             label counter(0);
 
-            forAllConstIter(labelHashSet, patchToNewPatches[patchI], it)
-                patchesForPatch[pName][counter++] = newPatches[it.key()].name();
+            for (const label it : patchToNewPatches[patchI])
+            {
+                patchesForPatch[pName][counter++] = newPatches[it].name();
+            }
         }
 
         reduce(foundProblematic, maxOp<bool>());
diff --git a/meshLibrary/utilities/workflowControls/workflowControls.C b/meshLibrary/utilities/workflowControls/workflowControls.C
index 463b2f0..e2d2e64 100644
--- a/meshLibrary/utilities/workflowControls/workflowControls.C
+++ b/meshLibrary/utilities/workflowControls/workflowControls.C
@@ -302,12 +302,13 @@ bool workflowControls::runCurrentStep(const word& stepName)
     }
 
     // check if the requested step exists in the database of steps
-    std::map<word, label>::const_iterator it = workflowSteps_.find(stepName);
-    if (it == workflowSteps_.end())
+    if (workflowSteps_.find(stepName) == workflowSteps_.end())
     {
         DynList<word> toc;
-        for (it = workflowSteps_.begin(); it!=workflowSteps_.end(); ++it)
+        forAllConstIters(workflowSteps_, it)
+        {
             toc.append(it->first);
+        }
 
         FatalErrorInFunction
             << "Step " << stepName << " is not a valid name."
diff --git a/testingInterfaces/testBndLayerSmoothing/testBndLayerSmoothing.C b/testingInterfaces/testBndLayerSmoothing/testBndLayerSmoothing.C
index 0fb7334..2513735 100644
--- a/testingInterfaces/testBndLayerSmoothing/testBndLayerSmoothing.C
+++ b/testingInterfaces/testBndLayerSmoothing/testBndLayerSmoothing.C
@@ -211,20 +211,20 @@ int main(int argc, char *argv[])
     labelHashSet badFaces;
     polyMeshGenChecks::findBadFaces(pmg, badFaces, true, &activeFace);
 
-    if (returnReduce(badFaces.size(), sumOp<label>()) )
+    if (returnReduce(badFaces.size(), sumOp<label>()))
     {
         const labelList& own = pmg.owner();
         const labelList& nei = pmg.neighbour();
 
         label badCellId(-1);
-        forAllConstIter(labelHashSet, badFaces, it)
+        for (const label facei : badFaces)
         {
             if (badCellId < 0)
                 badCellId = pmg.addCellSubset("badBlCells");
-            pmg.addCellToSubset(badCellId, own[it.key()]);
+            pmg.addCellToSubset(badCellId, own[facei]);
 
-            if (nei[it.key()] >= 0)
-                pmg.addCellToSubset(badCellId, nei[it.key()]);
+            if (nei[facei] >= 0)
+                pmg.addCellToSubset(badCellId, nei[facei]);
         }
 
         if (returnReduce(pmg.cellSubsetIndex("badBlCells")>=0, maxOp<bool>()))
-- 
GitLab