diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index f7c2caf8c6..9c196e2905 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -84,7 +84,7 @@
 
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         fields.add(Y[i]);
     }
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 01c428016e..c2f3640f2d 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -292,20 +292,14 @@ void addCutNeighbours
 
     labelHashSet addCutFaces(cutCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = cutCells.begin();
-        iter != cutCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cutCells, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cFaces = mesh.cells()[cellI];
 
         forAll(cFaces, i)
         {
-            label faceI = cFaces[i];
+            const label faceI = cFaces[i];
 
             if (mesh.isInternalFace(faceI))
             {
@@ -331,12 +325,7 @@ void addCutNeighbours
     Info<< "    Selected an additional " << addCutFaces.size()
         << " neighbours of cutCells to refine" << endl;
 
-    for
-    (
-        labelHashSet::const_iterator iter = addCutFaces.begin();
-        iter != addCutFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, addCutFaces, iter)
     {
         cutCells.insert(iter.key());
     }
@@ -386,21 +375,15 @@ bool limitRefinementLevel
 
     labelHashSet addCutCells(cutCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = cutCells.begin();
-        iter != cutCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cutCells, iter)
     {
         // cellI will be refined.
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cCells = mesh.cellCells()[cellI];
 
         forAll(cCells, i)
         {
-            label nbr = cCells[i];
+            const label nbr = cCells[i];
 
             if (!excludeCells.found(nbr) && !cutCells.found(nbr))
             {
@@ -419,12 +402,8 @@ bool limitRefinementLevel
         Info<< "Added an additional " << addCutCells.size() << " cells"
             << " to satisfy 1:" << limitDiff << " refinement level"
             << endl;
-        for
-        (
-            labelHashSet::const_iterator iter = addCutCells.begin();
-            iter != addCutCells.end();
-            ++iter
-        )
+
+        forAllConstIter(labelHashSet, addCutCells, iter)
         {
             cutCells.insert(iter.key());
         }
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index fb7b97a32d..5e0ce9248f 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -112,12 +112,7 @@ int main(int argc, char *argv[])
             << cells.instance()/cells.local()/cells.name()
             << nl << endl;
 
-        for
-        (
-            cellSet::const_iterator iter = cells.begin();
-            iter != cells.end();
-            ++iter
-        )
+        forAllConstIter(cellSet, cells, iter)
         {
             cutCells.erase(iter.key());
         }
@@ -131,7 +126,7 @@ int main(int argc, char *argv[])
 
     forAll(meshPoints, pointI)
     {
-        label meshPointI = meshPoints[pointI];
+        const label meshPointI = meshPoints[pointI];
 
         vertOnPatch[meshPointI] = true;
     }
@@ -151,8 +146,7 @@ int main(int argc, char *argv[])
 
         forAll(pEdges, pEdgeI)
         {
-            label edgeI = pEdges[pEdgeI];
-
+            const label edgeI = pEdges[pEdgeI];
             const edge& e = mesh.edges()[edgeI];
 
             label otherPointI = e.otherVertex(meshPointI);
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 1a55fd52f1..19828287bc 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -392,15 +392,9 @@ void collectCuts
     boolList edgeIsCut(mesh.nEdges(), false);
     scalarField edgeWeight(mesh.nEdges(), -GREAT);
 
-    for
-    (
-        cellSet::const_iterator iter = cellsToCut.begin();
-        iter != cellsToCut.end();
-        ++iter
-    )
+    forAllConstIter(cellSet, cellsToCut, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cEdges = cellEdges[cellI];
 
         forAll(cEdges, i)
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 52a29eb03f..2fb1c77043 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -268,13 +268,8 @@ int main(int argc, char *argv[])
 
     pointField points(slPoints.size());
 
-    label i=0;
-    for
-    (
-        SLList<point>::iterator pointIter = slPoints.begin();
-        pointIter != slPoints.end();
-        ++pointIter
-    )
+    label i = 0;
+    forAllConstIter(SLList<point>, slPoints, pointIter)
     {
         // Scale points for the given scale factor
         points[i++] = scaleFactor * pointIter();
@@ -283,13 +278,8 @@ int main(int argc, char *argv[])
 
     labelList pointMap(maxNodei+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator pointMapIter = slPointMap.begin();
-        pointMapIter != slPointMap.end();
-        ++pointMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slPointMap, pointMapIter)
     {
         pointMap[pointMapIter()] = i++;
     }
@@ -298,13 +288,8 @@ int main(int argc, char *argv[])
 
     labelList cellMap(maxCelli+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator cellMapIter = slCellMap.begin();
-        cellMapIter != slCellMap.end();
-        ++cellMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slCellMap, cellMapIter)
     {
         cellMap[cellMapIter()] = i++;
     }
@@ -323,12 +308,7 @@ int main(int argc, char *argv[])
     cellShapeList cellShapes(slCellLabels.size());
     label nCells = 0;
 
-    for
-    (
-        SLPtrList<labelList>::iterator cellIter = slCellLabels.begin();
-        cellIter != slCellLabels.end();
-        ++cellIter
-    )
+    forAllConstIter(SLPtrList<labelList>, slCellLabels, cellIter)
     {
         if      // Tetrahedron
         (
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 71b82cfb07..7fd22cf88a 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -327,12 +327,7 @@ if
 {
     scalar minz = GREAT;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
@@ -346,12 +341,7 @@ if
 
     SLList<face> newLinerFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[LINER][0].begin();
-        iter != pFaces[LINER][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
     {
         const face& pf = iter();
 
@@ -380,12 +370,7 @@ if
 
     SLList<face> newCylinderHeadFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index a3bf1a76e9..fedbe40610 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -468,12 +468,7 @@ int main(int argc, char *argv[])
          // Print region to patch mapping
         Info<< "Regions:" << endl;
 
-        for
-        (
-            Map<label>::const_iterator iter = regionToPatch.begin();
-            iter != regionToPatch.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, regionToPatch, iter)
         {
             Info<< "    region:" << iter.key() << '\t' << "patch:"
                 << iter() << endl;
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index a3a493258b..d0e067a070 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -356,12 +356,7 @@ void writePointCells
 
     label vertI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = allEdges.begin();
-        iter != allEdges.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, allEdges, iter)
     {
         const edge& e = mesh.edges()[iter.key()];
 
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index bb41dd57d0..8a30d3bdf8 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -100,12 +100,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "pointSets:" << pointObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = pointObjects.begin();
-        iter != pointObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, pointObjects, iter)
     {
         // Not in memory. Load it.
         pointSet set(*iter());
@@ -149,12 +144,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "faceSets:" << faceObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = faceObjects.begin();
-        iter != faceObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, faceObjects, iter)
     {
         // Not in memory. Load it.
         faceSet set(*iter());
@@ -288,12 +278,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "cellSets:" << cellObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = cellObjects.begin();
-        iter != cellObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, cellObjects, iter)
     {
         if (!slaveCellSets.found(iter.key()))
         {
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index e36c1aca0a..103d0f9097 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -81,8 +81,7 @@ Foam::label Foam::regionSide::otherEdge
 
     forAll(fEdges, fEdgeI)
     {
-        label otherEdgeI = fEdges[fEdgeI];
-
+        const label otherEdgeI = fEdges[fEdgeI];
         const edge& otherE = mesh.edges()[otherEdgeI];
 
         if
@@ -300,15 +299,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
     //
     labelHashSet regionEdges(4*regionFaces.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = regionFaces.begin();
-        iter != regionFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, regionFaces, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const labelList& fEdges = mesh.faceEdges()[faceI];
 
         forAll(fEdges, fEdgeI)
@@ -326,12 +319,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
     labelHashSet visitedPoint(4*regionFaces.size());
 
     // Insert fence points so we don't visit them
-    for
-    (
-        labelHashSet::const_iterator iter = fencePoints.begin();
-        iter != fencePoints.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, fencePoints, iter)
     {
         visitedPoint.insert(iter.key());
     }
@@ -344,14 +332,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
         Info<< "Excluding visit of points:" << visitedPoint << endl;
     }
 
-    for
-    (
-        labelHashSet::const_iterator iter = regionFaces.begin();
-        iter != regionFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, regionFaces, iter)
     {
-        label faceI = iter.key();
+        const label faceI = iter.key();
 
         // Get side of face.
         label cellI;
@@ -459,12 +442,7 @@ Foam::regionSide::regionSide
 
     labelHashSet fencePoints(fenceEdges.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = fenceEdges.begin();
-        iter != fenceEdges.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, fenceEdges, iter)
     {
         const edge& e = mesh.edges()[iter.key()];
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 999884ddae..3b7bb42a1c 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
 
         labelList osf(slavePatch.size());
 
-        forAll (osf, i)
+        forAll(osf, i)
         {
             osf[i] = slavePatch.start() + i;
         }
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 20bff4cc01..8945c0cf5e 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -76,12 +76,7 @@ int main(int argc, char *argv[])
 
             if (args.optionFound("keywords") && !args.optionFound("entry"))
             {
-                for
-                (
-                    IDLList<entry>::iterator iter = dict.begin();
-                    iter != dict.end();
-                    ++iter
-                )
+                forAllConstIter(dictionary, dict, iter)
                 {
                     Info<< iter().keyword() << endl;
                 }
@@ -137,13 +132,8 @@ int main(int argc, char *argv[])
                         }
                         */
 
-                        const dictionary& dict(entPtr->dict());
-                        for
-                        (
-                            IDLList<entry>::const_iterator iter = dict.begin();
-                            iter != dict.end();
-                            ++iter
-                        )
+                        const dictionary& dict = entPtr->dict();
+                        forAllConstIter(dictionary, dict, iter)
                         {
                             Info<< iter().keyword() << endl;
                         }
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 959aaf7031..1a9bff5429 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -506,12 +506,7 @@ void Foam::domainDecomposition::decomposeMesh()
             // Add internal and boundary faces
             // Remember to increment the index by one such that the
             // turning index works properly.
-            for
-            (
-                SLList<label>::iterator curProcFacesIter = curProcFaces.begin();
-                curProcFacesIter != curProcFaces.end();
-                ++curProcFacesIter
-            )
+            forAllIter(SLList<label>, curProcFaces, curProcFacesIter)
             {
                 curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
                 nFaces++;
@@ -564,12 +559,11 @@ void Foam::domainDecomposition::decomposeMesh()
 
                 // add faces for this processor boundary
 
-                for
+                forAllIter
                 (
-                    SLList<label>::iterator curFacesIter =
-                        curInterProcBFacesIter().begin();
-                    curFacesIter != curInterProcBFacesIter().end();
-                    ++curFacesIter
+                    SLList<label>,
+                    curInterProcBFacesIter(),
+                    curFacesIter
                 )
                 {
                     // add the face
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C
index d6e05dd5cb..026e694829 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C
@@ -48,22 +48,13 @@ void Foam::readFields
     // Construct the vol scalar fields
     fields.setSize(fieldObjects.size());
 
-    label fieldi=0;
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    label fieldI = 0;
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         fields.set
         (
-            fieldi++,
-            new GeoField
-            (
-                *iter(),
-                mesh
-            )
+            fieldI++,
+            new GeoField(*iter(), mesh)
         );
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index d4b6d13b95..d469054ca3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -110,34 +110,21 @@ int main(int argc, char *argv[])
         // Search list of objects for volScalarFields
         IOobjectList scalarFields(objects.lookupClass("volScalarField"));
 
-        for
-        (
-            IOobjectList::iterator scalarFieldIter = scalarFields.begin();
-            scalarFieldIter != scalarFields.end();
-            ++scalarFieldIter
-        )
+        forAllIter(IOobjectList, scalarFields, iter)
         {
             // Read field
-            volScalarField field
+            volScalarField field(*iter(), mesh);
+
+            // lookup field from dictionary and convert field
+            label unitNumber;
+            if
             (
-                *scalarFieldIter(),
-                mesh
-            );
-
-            // lookup field from dictionary
-            if (foamDataToFluentDict.found(field.name()))
+                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+             && unitNumber > 0
+            )
             {
-                label unitNumber
-                (
-                    readLabel(foamDataToFluentDict.lookup(field.name()))
-                );
-
-                // Convert field
-                if (unitNumber > 0)
-                {
-                    Info<< "    Converting field " << field.name() << endl;
-                    writeFluentField(field, unitNumber, fluentDataFile);
-                }
+                Info<< "    Converting field " << field.name() << endl;
+                writeFluentField(field, unitNumber, fluentDataFile);
             }
         }
 
@@ -148,34 +135,21 @@ int main(int argc, char *argv[])
         // Search list of objects for volVectorFields
         IOobjectList vectorFields(objects.lookupClass("volVectorField"));
 
-        for
-        (
-            IOobjectList::iterator vectorFieldIter = vectorFields.begin();
-            vectorFieldIter != vectorFields.end();
-            ++vectorFieldIter
-        )
+        forAllIter(IOobjectList, vectorFields, iter)
         {
             // Read field
-            volVectorField field
+            volVectorField field(*iter(), mesh);
+
+            // lookup field from dictionary and convert field
+            label unitNumber;
+            if
             (
-                *vectorFieldIter(),
-                mesh
-            );
-
-            // lookup field from dictionary
-            if (foamDataToFluentDict.found(field.name()))
+                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+             && unitNumber > 0
+            )
             {
-                label unitNumber
-                (
-                    readLabel(foamDataToFluentDict.lookup(field.name()))
-                );
-
-                // Convert field
-                if (unitNumber > 0)
-                {
-                    Info<< "    Converting field " << field.name() << endl;
-                    writeFluentField(field, unitNumber, fluentDataFile);
-                }
+                Info<< "    Converting field " << field.name() << endl;
+                writeFluentField(field, unitNumber, fluentDataFile);
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 124bab1411..a49c4e188e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -22,11 +22,11 @@ for (label i=0; i < nTypes; i++)
 
         if (fieldTypes[i] == "volScalarField")
         {
-            volScalarField gmvScalarField(fieldObject, mesh);
+            volScalarField fld(fieldObject, mesh);
             gmvFile << fieldName << " 0" << nl;
             for (label indx=0;indx<mesh.nCells();indx++)
             {
-                gmvFile << gmvScalarField[indx] << " ";
+                gmvFile << fld[indx] << " ";
             }
             gmvFile << nl;
         }
@@ -35,19 +35,19 @@ for (label i=0; i < nTypes; i++)
         {
             if (fieldName == vComp)
             {
-                volVectorField gmvVectorField(fieldObject, mesh);
+                volVectorField fld(fieldObject, mesh);
                 gmvFile << "velocity 0" << nl;
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].x() << " ";
+                    gmvFile << fld[indx].x() << " ";
                 }
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].y() << " ";
+                    gmvFile << fld[indx].y() << " ";
                 }
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].z() << " ";
+                    gmvFile << fld[indx].z() << " ";
                 }
                 gmvFile << nl;
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
index a99b94133e..c3d545402d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
@@ -1,42 +1,27 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << ' ';
 }
 gmvFile << nl;
 
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << ' ';
 }
 gmvFile << nl;
 
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << ' ';
 }
 gmvFile << nl;
 
 forAll(lagrangianScalarNames, i)
 {
-    word name = lagrangianScalarNames[i];
+    const word name = lagrangianScalarNames[i];
 
-    IOField<scalar> s
+    IOField<scalar> fld
     (
         IOobject
         (
@@ -49,13 +34,13 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size())
+    if (fld.size())
     {
         gmvFile << name  << nl;
 
-        for (label n = 0; n < s.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << s[n] << token::SPACE;
+            gmvFile << fld[n] << token::SPACE;
         }
         gmvFile << nl;
     }
@@ -65,9 +50,9 @@ forAll(lagrangianScalarNames, i)
 
 forAll(lagrangianVectorNames, i)
 {
-    word name = lagrangianVectorNames[i];
+    const word name = lagrangianVectorNames[i];
 
-    IOField<vector> v
+    IOField<vector> fld
     (
         IOobject
         (
@@ -80,29 +65,29 @@ forAll(lagrangianVectorNames, i)
         )
     );
 
-    if (v.size())
+    if (fld.size())
     {
         gmvFile << name + "x" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].x() << token::SPACE;
+            gmvFile << fld[n].x() << token::SPACE;
         }
         gmvFile << nl;
 
         gmvFile << name + "y" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].y() << token::SPACE;
+            gmvFile << fld[n].y() << token::SPACE;
         }
         gmvFile << nl;
 
         gmvFile << name + "z" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].z() << token::SPACE;
+            gmvFile << fld[n].z() << token::SPACE;
         }
         gmvFile << nl;
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
index 196169f894..ad46f67109 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
@@ -1,81 +1,48 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << " ";
 }
 gmvFile << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << " ";
 }
 gmvFile << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "U" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().x() << " ";
+    gmvFile << iter().velocity().x() << " ";
 }
 gmvFile << nl;
+
 gmvFile << "V" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().y() << " ";
+    gmvFile << iter().velocity().y() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "W" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().z() << " ";
+{
+    gmvFile << iter().velocity().z() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "Diam" << nl;
-
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().d() << " ";
+    gmvFile << iter().d() << " ";
 }
 
-
 gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
index 3c4f629235..725bf836aa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
@@ -1,32 +1,19 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << " ";
 }
 gmvFile << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << " ";
 }
 gmvFile << nl;
-for
-(
-    Cloud<passiveParticles>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << " ";
 }
 gmvFile << nl;
 
@@ -51,15 +38,13 @@ forAll(lagrangianScalarNames, i)
     {
         gmvFile << name  << nl;
 
-        for (label n = 0; n < s.size(); n++)
+        forAll(s, n)
         {
             gmvFile << s[n] << token::SPACE;
         }
         gmvFile << nl;
     }
 
-
 }
 
-
 gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
index 4afa84809b..e649658d19 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
@@ -1,2 +1,3 @@
-gmvFile << "probtime  " << runTime.timeName() << nl;
-gmvFile << "endgmv" << nl;
+gmvFile
+    << "probtime  " << runTime.timeName() << nl
+    << "endgmv" << nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
index 35f30932b4..c1a0cd7c78 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
@@ -26,13 +26,14 @@ word format
     conversionProperties.lookup("format")
 );
 
-if ( (format != "ascii") && (format != "ieeei4r8") )
+if ((format != "ascii") && (format != "ieeei4r8"))
 {
     FatalError << "format type: " << format << " unknown."
         << " Valid options are: ascii ieeei4r8"
         << abort(FatalError);
 
 }
+
 word cells
 (
     conversionProperties.lookup("cells")
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
index 238c421b9a..c9c07fc368 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
@@ -50,12 +50,7 @@ void readFields
     label nFields = fields.size();
     fields.setSize(nFields + fieldObjects.size());
 
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    forAllIter(IOobjectList::iterator, fieldObjects, iter)
     {
         if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 4d9453f2fe..d626249dcf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -50,12 +50,7 @@ void readFields
     fields.setSize(fieldObjects.size());
     label nFields = 0;
 
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
index e5b9e61b15..a1a19b90a6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
@@ -27,14 +27,9 @@ License
 #include "OFstream.H"
 #include "writeFuns.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void writeFaceSet
+void Foam::writeFaceSet
 (
     const bool binary,
     const vtkMesh& vMesh,
@@ -73,12 +68,7 @@ void writeFaceSet
     labelList setFaceLabels(set.size());
     label setFaceI = 0;
 
-    for
-    (
-        faceSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, set, iter)
     {
         setFaceLabels[setFaceI] = iter.key();
         setFaces[setFaceI] = faces[iter.key()];
@@ -139,8 +129,5 @@ void writeFaceSet
     writeFuns::write(pStream, binary, setFaceLabels);
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
index 68ebbf768e..de8c90d7ae 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
@@ -47,19 +47,13 @@ int USERD_get_part_coords
     }
     else if (part_number == nPatches+2)
     {
-
         label indx = 1;
 
-        for
-        (
-            Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
-            elmnt != sprayPtr->end();
-            ++elmnt
-        )
+        forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
         {
-            coord_array[0][indx] = (float)elmnt().position().x();
-            coord_array[1][indx] = (float)elmnt().position().y();
-            coord_array[2][indx] = (float)elmnt().position().z();
+            coord_array[0][indx] = (float)iter().position().x();
+            coord_array[1][indx] = (float)iter().position().y();
+            coord_array[2][indx] = (float)iter().position().z();
             indx++;
         }
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
index c05af41ccd..b270a1b57b 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
@@ -17,7 +17,7 @@ int USERD_get_part_node_ids
             nodeid_array[indx] = indx + 1;
         }
     }
-    else if  (part_number < nPatches+2)
+    else if (part_number < nPatches+2)
     {
 
         label patchi = part_number-2;
@@ -32,18 +32,14 @@ int USERD_get_part_node_ids
         }
 
     }
-    else if  (part_number == nPatches+2)
+    else if (part_number == nPatches+2)
     {
         label indx = 0;
-        for
-        (
-            Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
-            elmnt != sprayPtr->end();
-            ++elmnt
-        )
+
+        forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
         {
-             nodeid_array[indx] = indx + 1;
-             indx++;
+            nodeid_array[indx] = indx + 1;
+            indx++;
         }
     }
     else
diff --git a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
index e18a7d55c3..fd8d4163df 100644
--- a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
@@ -52,12 +52,7 @@ void MapConsistentVolFields
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllIter(IOobjectList, fields, fieldIter)
     {
         Info<< "    interpolating " << fieldIter()->name()
             << endl;
diff --git a/applications/utilities/preProcessing/mapFields/MapVolFields.H b/applications/utilities/preProcessing/mapFields/MapVolFields.H
index c8b360f98f..7bc16c3c4e 100644
--- a/applications/utilities/preProcessing/mapFields/MapVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapVolFields.H
@@ -52,12 +52,7 @@ void MapVolFields
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllIter(IOobjectList, fields, fieldIter)
     {
         IOobject fieldTargetIOobject
         (
diff --git a/applications/utilities/preProcessing/mapFields/UnMapped.H b/applications/utilities/preProcessing/mapFields/UnMapped.H
index bd480e4cfa..8e5ee42792 100644
--- a/applications/utilities/preProcessing/mapFields/UnMapped.H
+++ b/applications/utilities/preProcessing/mapFields/UnMapped.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,12 +39,7 @@ void UnMapped(const IOobjectList& objects)
 {
     IOobjectList fields = objects.lookupClass(Type::typeName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllConstIter(IOobjectList, fields, fieldIter)
     {
         mvBak(fieldIter()->objectPath(), "unmapped");
     }
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 2d58fcd313..ce32c54206 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -126,18 +126,13 @@ void dumpFaces
 
     OFstream os(fName);
 
-    for
-    (
-        Map<label>::const_iterator iter = connectedFaces.begin();
-        iter != connectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, connectedFaces, iter)
     {
         const labelledTri& f = surf.localFaces()[iter.key()];
 
         point ctr(f.centre(surf.localPoints()));
 
-        os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
+        os  << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
     }
 }
 
@@ -502,14 +497,9 @@ void calcPointVecs
 
     boolList edgeDone(surf.nEdges(), false);
 
-    for
-    (
-        Map<label>::const_iterator iter = faceToEdge.begin();
-        iter != faceToEdge.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, faceToEdge, iter)
     {
-        label edgeI = iter();
+        const label edgeI = iter();
 
         if (!edgeDone[edgeI])
         {
@@ -610,15 +600,9 @@ void renumberFaces
     List<labelledTri>& newTris
 )
 {
-    for
-    (
-        Map<label>::const_iterator iter = faceToEdge.begin();
-        iter != faceToEdge.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, faceToEdge, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const labelledTri& f = surf.localFaces()[faceI];
 
         forAll(f, fp)
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 2a791d3bb4..c9c02d199b 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
 {
 
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 
     Info<< nl << "Reading Burcat data IOdictionary" << endl;
@@ -119,17 +118,11 @@ int main(int argc, char *argv[])
     );
 
 
-    for
-    (
-        SLPtrList<thermo>::iterator EQreactionsIter = EQreactions.begin();
-        EQreactionsIter != EQreactions.end();
-        ++EQreactionsIter
-    )
+    forAllConstIter(SLPtrList<thermo>, EQreactions, iter)
     {
-        Info<< "Kc(EQreactions) = " << EQreactionsIter().Kc(T) << endl;
+        Info<< "Kc(EQreactions) = " << iter().Kc(T) << endl;
     }
 
-
     Info<< nl << "end" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index 0c7e24d65f..6bb7c256bd 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -80,7 +80,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 {
     List<Keyed<T> > newList(lst.size());
 
-    forAll (lst, elemI)
+    forAll(lst, elemI)
     {
         newList[elemI] = Keyed(lst[elemI], key);
     }
@@ -106,7 +106,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
 
     List<Keyed<T> > newList(lst.size());
 
-    forAll (lst, elemI)
+    forAll(lst, elemI)
     {
         newList[elemI] = Keyed(lst[elemI], keys[elemI]);
     }
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 02640c095b..de9a64c2a1 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -152,12 +152,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
 {
     IOobjectList objectsOfClass(size());
 
-    for
-    (
-        HashPtrTable<IOobject>::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
     {
         if (iter()->headerClassName() == ClassName)
         {
@@ -192,12 +187,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
     wordList objectNames(size());
 
     label count = 0;
-    for
-    (
-        HashPtrTable<IOobject>::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
     {
         if (iter()->headerClassName() == ClassName)
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 549b662719..705505a716 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -379,7 +379,7 @@ interfaces() const
 {
     lduInterfaceFieldPtrsList interfaces(this->size());
 
-    forAll (interfaces, patchi)
+    forAll(interfaces, patchi)
     {
         if (isA<lduInterfaceField>(this->operator[](patchi)))
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 6fae84d14b..65d1a7542f 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -50,7 +50,7 @@ slicedBoundaryField
 
     FieldField<PatchField, Type>& bf = tbf();
 
-    forAll (mesh.boundary(), patchi)
+    forAll(mesh.boundary(), patchi)
     {
         if (preserveCouples && mesh.boundary()[patchi].coupled())
         {
@@ -119,7 +119,7 @@ slicedBoundaryField
 
     FieldField<PatchField, Type>& bf = tbf();
 
-    forAll (mesh.boundary(), patchi)
+    forAll(mesh.boundary(), patchi)
     {
         if (preserveCouples && mesh.boundary()[patchi].coupled())
         {
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 8185f4ae42..1b18dbdc21 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -144,7 +144,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
     tmp<Field<Type1> > tvalues(new Field<Type1>(meshPoints.size()));
     Field<Type1>& values = tvalues();
 
-    forAll (meshPoints, pointI)
+    forAll(meshPoints, pointI)
     {
         values[pointI] = iF[meshPoints[pointI]];
     }
@@ -202,7 +202,7 @@ void pointPatchField<Type>::addToInternalField
     // Get the addressing
     const labelList& mp = patch().meshPoints();
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         iF[mp[pointI]] += pF[pointI];
     }
@@ -292,7 +292,7 @@ void pointPatchField<Type>::setInInternalField
             << abort(FatalError);
     }
 
-    forAll (meshPoints, pointI)
+    forAll(meshPoints, pointI)
     {
         iF[meshPoints[pointI]] = pF[pointI];
     }
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 04e233cd82..1257377608 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -47,7 +47,7 @@ void graph::readCurves(Istream& is)
     x_.setSize(xyData.size());
     scalarField y(xyData.size());
 
-    forAll (xyData, i)
+    forAll(xyData, i)
     {
         x_[i] = xyData[i].x_;
         y[i] = xyData[i].y_;
@@ -191,18 +191,13 @@ void graph::writeTable(Ostream& os) const
 {
     forAll(x_, xi)
     {
-        os << setw(10) << x_[xi];
+        os  << setw(10) << x_[xi];
 
-        for
-        (
-            graph::const_iterator iter = begin();
-            iter != end();
-            ++iter
-        )
+        forAllConstIter(graph, *this, iter)
         {
-            os << token::SPACE << setw(10) << (*iter())[xi];
+            os  << token::SPACE << setw(10) << (*iter())[xi];
         }
-        os << endl;
+        os  << endl;
     }
 }
 
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
index a36c14503b..48085787b7 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
+++ b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
@@ -51,7 +51,7 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
 
     bool firstField = true;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         if (!firstField)
         {
@@ -64,9 +64,9 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
     os << "; pause -1" << endl;
 
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
-        os << endl;
+        os  << endl;
         writeXY(g.x(), *iter(), os);
     }
 }
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
index 2b60df9900..eff00c0d68 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
+++ b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
@@ -41,12 +41,12 @@ namespace Foam
 
 void Foam::jplotGraph::write(const graph& g, Ostream& os) const
 {
-    os  << "# JPlot file" << endl
+    os  << "# JPlot file" << nl
         << "# column 1: " << g.xName() << endl;
 
     label fieldI = 0;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         os  << "# column " << fieldI + 2 << ": " << (*iter()).name() << endl;
         fieldI++;
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
index 94fbe319cc..4d9b07bde6 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
+++ b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
@@ -42,17 +42,17 @@ namespace Foam
 
 void Foam::xmgrGraph::write(const graph& g, Ostream& os) const
 {
-    os  << "@title " << g.title() << endl
-        << "@xaxis label " << g.xName() << endl
+    os  << "@title " << g.title() << nl
+        << "@xaxis label " << g.xName() << nl
         << "@yaxis label " << g.yName() << endl;
 
     label fieldI = 0;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         os  << "@s" << fieldI << " legend "
-            << iter()->name() << endl
-            << "@target G0.S" << fieldI << endl
+            << iter()->name() << nl
+            << "@target G0.S" << fieldI << nl
             << "@type xy" << endl;
 
         writeXY(g.x(), *iter(), os);
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index e119b1a059..e101977abd 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -73,7 +73,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
     bool doWeights = false;
 
-    forAll (pointAddressing, pointI)
+    forAll(pointAddressing, pointI)
     {
         doWeights = false;
 
@@ -146,7 +146,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
             edgeList hitFaceEdges =
                 fromPatchFaces[proj[pointI].hitObject()].edges();
 
-            forAll (hitFaceEdges, edgeI)
+            forAll(hitFaceEdges, edgeI)
             {
                 minEdgeLength =
                     min
@@ -158,7 +158,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
             const labelList& curEdges = toPatchPointEdges[pointI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 minEdgeLength =
                     min
@@ -208,7 +208,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
             pointField hitFacePoints = hitFace.points(fromPatchPoints);
 
-            forAll (hitFacePoints, masterPointI)
+            forAll(hitFacePoints, masterPointI)
             {
                 pointWeights[pointI][masterPointI] =
                     1.0/
@@ -252,7 +252,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
 
     vectorField fromPatchFaceCentres(fromPatchFaces.size());
 
-    forAll (fromPatchFaceCentres, faceI)
+    forAll(fromPatchFaceCentres, faceI)
     {
         fromPatchFaceCentres[faceI] =
             fromPatchFaces[faceI].centre(fromPatchPoints);
@@ -275,7 +275,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
     faceAddressingPtr_ = new labelList(proj.size(), -1);
     labelList& faceAddressing = *faceAddressingPtr_;
 
-    forAll (faceAddressing, faceI)
+    forAll(faceAddressing, faceI)
     {
         if (proj[faceI].hit())
         {
@@ -327,7 +327,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
 
                 faceWeights[faceI][0] = 1.0/m;
 
-                forAll (neighbours, nI)
+                forAll(neighbours, nI)
                 {
                     faceWeights[faceI][nI + 1] =
                     1.0/
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 5b5fdc7a5f..a2bad68c26 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -71,7 +71,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
     const labelList& addr = pointAddr();
 
-    forAll (result, pointI)
+    forAll(result, pointI)
     {
         const scalarField& curWeights = weights[pointI];
 
@@ -80,7 +80,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
             const labelList& hitFacePoints =
                 fromPatchLocalFaces[addr[pointI]];
 
-            forAll (curWeights, wI)
+            forAll(curWeights, wI)
             {
                 result[pointI] += curWeights[wI]*pf[hitFacePoints[wI]];
             }
@@ -142,7 +142,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 
     const labelList& addr = faceAddr();
 
-    forAll (result, faceI)
+    forAll(result, faceI)
     {
         const scalarField& curWeights = weights[faceI];
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index fcd50eacd1..87dee6babc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -44,7 +44,7 @@ void Foam::lduAddressing::calcLosort() const
 
     const unallocLabelList& nbr = upperAddr();
 
-    forAll (nbr, nbrI)
+    forAll(nbr, nbrI)
     {
         nNbrOfFace[nbr[nbrI]]++;
     }
@@ -52,7 +52,7 @@ void Foam::lduAddressing::calcLosort() const
     // Create temporary neighbour addressing
     labelListList cellNbrFaces(size());
 
-    forAll (cellNbrFaces, cellI)
+    forAll(cellNbrFaces, cellI)
     {
         cellNbrFaces[cellI].setSize(nNbrOfFace[cellI]);
     }
@@ -61,7 +61,7 @@ void Foam::lduAddressing::calcLosort() const
     nNbrOfFace = 0;
 
     // Scatter the neighbour faces
-    forAll (nbr, nbrI)
+    forAll(nbr, nbrI)
     {
         cellNbrFaces[nbr[nbrI]][nNbrOfFace[nbr[nbrI]]] = nbrI;
 
@@ -76,11 +76,11 @@ void Foam::lduAddressing::calcLosort() const
     // Set counter for losort
     label lstI = 0;
 
-    forAll (cellNbrFaces, cellI)
+    forAll(cellNbrFaces, cellI)
     {
         const labelList& curNbr = cellNbrFaces[cellI];
 
-        forAll (curNbr, curNbrI)
+        forAll(curNbr, curNbrI)
         {
             lst[lstI] = curNbr[curNbrI];
             lstI++;
@@ -109,7 +109,7 @@ void Foam::lduAddressing::calcOwnerStart() const
     label nOwnStart = 0;
     label i = 1;
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         label curOwn = own[faceI];
 
@@ -148,7 +148,7 @@ void Foam::lduAddressing::calcLosortStart() const
     label nLsrtStart = 0;
     label i = 0;
 
-    forAll (lsrt, faceI)
+    forAll(lsrt, faceI)
     {
         // Get neighbour
         const label curNbr = nbr[lsrt[faceI]];
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index b0680fc5d4..2d1ff23a59 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -42,7 +42,7 @@ void Foam::lduMatrix::initMatrixInterfaces
      || Pstream::defaultCommsType == Pstream::nonBlocking
     )
     {
-        forAll (interfaces, interfaceI)
+        forAll(interfaces, interfaceI)
         {
             if (interfaces.set(interfaceI))
             {
@@ -117,7 +117,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
             OPstream::waitRequests();
         }
 
-        forAll (interfaces, interfaceI)
+        forAll(interfaces, interfaceI)
         {
             if (interfaces.set(interfaceI))
             {
@@ -138,7 +138,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
         const lduSchedule& patchSchedule = this->patchSchedule();
 
         // Loop over all the "normal" interfaces relating to standard patches
-        forAll (patchSchedule, i)
+        forAll(patchSchedule, i)
         {
             label interfaceI = patchSchedule[i].patch;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 78d1e07205..e39bb19b5a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -88,7 +88,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     label nCoarseFaces = 0;
 
     // Loop through all fine faces
-    forAll (upperAddr, fineFacei)
+    forAll(upperAddr, fineFacei)
     {
         label rmUpperAddr = restrictMap[upperAddr[fineFacei]];
         label rmLowerAddr = restrictMap[lowerAddr[fineFacei]];
@@ -174,7 +174,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
 
     label coarseFacei = 0;
 
-    forAll (cCellnFaces, cci)
+    forAll(cCellnFaces, cci)
     {
         label* cFaces = &cCellFaces[maxNnbrs*cci];
         label ccnFaces = cCellnFaces[cci];
@@ -223,7 +223,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     labelListList coarseInterfaceAddr(fineInterfaces.size());
 
     // Initialise transfer of restrict addressing on the interface
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
@@ -236,7 +236,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     }
 
     // Add the coarse level
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 1097f35b22..4431db24df 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -202,7 +202,7 @@ Foam::GAMGAgglomeration::~GAMGAgglomeration()
     {
         lduInterfacePtrsList& curLevel = interfaceLevels_[leveli];
 
-        forAll (curLevel, i)
+        forAll(curLevel, i)
         {
             if (curLevel.set(i))
             {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 9129e62ae2..57d4bdcfa4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -48,18 +48,18 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
     {
         labelList nNbrs(nFineCells, 0);
 
-        forAll (upperAddr, facei)
+        forAll(upperAddr, facei)
         {
             nNbrs[upperAddr[facei]]++;
         }
 
-        forAll (lowerAddr, facei)
+        forAll(lowerAddr, facei)
         {
             nNbrs[lowerAddr[facei]]++;
         }
 
         cellFaceOffsets[0] = 0;
-        forAll (nNbrs, celli)
+        forAll(nNbrs, celli)
         {
             cellFaceOffsets[celli+1] = cellFaceOffsets[celli] + nNbrs[celli];
         }
@@ -67,7 +67,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
         // reset the whole list to use as counter
         nNbrs = 0;
 
-        forAll (upperAddr, facei)
+        forAll(upperAddr, facei)
         {
             cellFaces
             [
@@ -77,7 +77,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
             nNbrs[upperAddr[facei]]++;
         }
 
-        forAll (lowerAddr, facei)
+        forAll(lowerAddr, facei)
         {
             cellFaces
             [
@@ -187,7 +187,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
     // (doesn't always help and is sometimes detrimental)
     nCoarseCells--;
 
-    forAll (coarseCellMap, celli)
+    forAll(coarseCellMap, celli)
     {
         coarseCellMap[celli] = nCoarseCells - coarseCellMap[celli];
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
index 0d210f38f9..8e977a6a9b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
@@ -78,7 +78,7 @@ void Foam::pairGAMGAgglomeration::combineLevels(const label curLevel)
     const lduInterfacePtrsList& curInterLevel = interfaceLevels_[curLevel+1];
     lduInterfacePtrsList& prevInterLevel = interfaceLevels_[prevLevel+1];
 
-    forAll (prevInterLevel, inti)
+    forAll(prevInterLevel, inti)
     {
         if (prevInterLevel.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index f63fad767d..7c87a765d4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -127,11 +127,11 @@ Foam::GAMGSolver::GAMGSolver
 Foam::GAMGSolver::~GAMGSolver()
 {
     // Clear the the lists of pointers to the interfaces
-    forAll (interfaceLevels_, leveli)
+    forAll(interfaceLevels_, leveli)
     {
         lduInterfaceFieldPtrsList& curLevel = interfaceLevels_[leveli];
 
-        forAll (curLevel, i)
+        forAll(curLevel, i)
         {
             if (curLevel.set(i))
             {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 1516fb6894..7447c152cd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -91,7 +91,7 @@ void Foam::GAMGSolver::agglomerateMatrix(const label fineLevelIndex)
         interfaceLevelsIntCoeffs_[fineLevelIndex];
 
     // Add the coarse level
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index efe3fbb1e5..2aae470a68 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -377,7 +377,7 @@ void Foam::GAMGSolver::initVcycle
         )
     );
 
-    forAll (matrixLevels_, leveli)
+    forAll(matrixLevels_, leveli)
     {
         coarseCorrFields.set
         (
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 0d4da4313b..5446a83e5e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type> > Foam::GAMGInterface::interfaceInternalField
     tmp<Field<Type> > tresult(new Field<Type>(size()));
     Field<Type>& result = tresult();
 
-    forAll (result, elemI)
+    forAll(result, elemI)
     {
         result[elemI] = iF[faceCells_[elemI]];
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 5971b5af3f..4ec2acfef2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -144,7 +144,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     nCoarseFaces = 0;
 
     // On master side, the owner addressing is stored in table of contents
-    forAll (contents, masterI)
+    forAll(contents, masterI)
     {
         SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -163,12 +163,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = contents[masterI];
 
-            for
-            (
-                SLList<label>::iterator facesIter = faceFacesIter().begin();
-                facesIter != faceFacesIter().end();
-                ++facesIter
-            )
+            forAllIter(SLList<label>, faceFacesIter(), facesIter)
             {
                 faceRestrictAddressing_[facesIter()] = nCoarseFaces;
             }
@@ -178,7 +173,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     }
 
     // On slave side, the owner addressing is stored in linked lists
-    forAll (contents, masterI)
+    forAll(contents, masterI)
     {
         SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -197,12 +192,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = nbrsIter();
 
-            for
-            (
-                SLList<label>::iterator facesIter = faceFacesIter().begin();
-                facesIter != faceFacesIter().end();
-                ++facesIter
-            )
+            forAllIter(SLList<label>, faceFacesIter(), facesIter)
             {
                 faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces;
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index d614355b55..d56e24763f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -71,7 +71,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
 
     label nCoarseFaces = 0;
 
-    forAll (localRestrictAddressing, ffi)
+    forAll(localRestrictAddressing, ffi)
     {
         label curMaster = -1;
         label curSlave = -1;
@@ -159,7 +159,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     if (myProcNo() < neighbProcNo())
     {
         // On master side, the owner addressing is stored in table of contents
-        forAll (contents, masterI)
+        forAll(contents, masterI)
         {
             SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -180,12 +180,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = contents[masterI];
 
-                for
-                (
-                    SLList<label>::iterator facesIter = faceFacesIter().begin();
-                    facesIter != faceFacesIter().end();
-                    ++facesIter
-                )
+                forAllIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
@@ -197,7 +192,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     else
     {
         // On slave side, the owner addressing is stored in linked lists
-        forAll (contents, masterI)
+        forAll(contents, masterI)
         {
             SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -218,12 +213,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = nbrsIter();
 
-                for
-                (
-                    SLList<label>::iterator facesIter = faceFacesIter().begin();
-                    facesIter != faceFacesIter().end();
-                    ++facesIter
-                )
+                forAllIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index acf8a79f6f..1a9811388a 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -48,13 +48,13 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
     label cellInOrder = 0;
 
     // reset the visited cells list
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         visited[cellI] = 0;
     }
 
     // loop over the cells
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         // find the first cell that has not been visited yet
         if (visited[cellI] == 0)
@@ -85,7 +85,7 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
                     const labelList& neighbours =
                         cellCellAddressing[currentCell];
 
-                    forAll (neighbours, nI)
+                    forAll(neighbours, nI)
                     {
                         if (visited[neighbours[nI]] == 0)
                         {
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 080e968144..ab10b577f0 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -41,7 +41,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         maxVert += f[faces[faceI]].size();
     }
@@ -52,7 +52,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
     // in the first face there is no duplicates
     const labelList& first = f[faces[0]];
 
-    forAll (first, pointI)
+    forAll(first, pointI)
     {
         p[pointI] = first[pointI];
     }
@@ -67,7 +67,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
     {
         const labelList& curFace = f[faces[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             const label curPoint = curFace[pointI];
 
@@ -126,7 +126,7 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
     // create a list of edges
     label maxNoEdges = 0;
 
-    forAll (curFaces, faceI)
+    forAll(curFaces, faceI)
     {
         maxNoEdges += f[curFaces[faceI]].nEdges();
     }
@@ -134,11 +134,11 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
     edgeList allEdges(maxNoEdges);
     label nEdges = 0;
 
-    forAll (curFaces, faceI)
+    forAll(curFaces, faceI)
     {
         const edgeList curFaceEdges = f[curFaces[faceI]].edges();
 
-        forAll (curFaceEdges, faceEdgeI)
+        forAll(curFaceEdges, faceEdgeI)
         {
             const edge& curEdge = curFaceEdges[faceEdgeI];
 
@@ -197,7 +197,7 @@ Foam::point Foam::cell::centre
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         scalar a = f[faces[faceI]].mag(p);
         cEst += f[faces[faceI]].centre(p)*a;
@@ -212,7 +212,7 @@ Foam::point Foam::cell::centre
 
     scalar sumV = 0;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         // calculate pyramid volume. If it is greater than zero, OK.
         // If not, the pyramid is inside-out. Create a face with the opposite
@@ -256,7 +256,7 @@ Foam::scalar Foam::cell::mag
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         cEst += f[faces[faceI]].centre(p);
         nCellFaces += 1;
@@ -267,7 +267,7 @@ Foam::scalar Foam::cell::mag
     // Calculate the magnitude by summing the mags of the pyramids
     scalar v = 0;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         v += ::Foam::mag(pyramidPointFaceRef(f[faces[faceI]], cEst).mag(p));
     }
@@ -288,13 +288,13 @@ bool Foam::operator==(const cell& a, const cell& b)
 
     List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         label curLabel = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLabel)
             {
@@ -313,7 +313,7 @@ bool Foam::operator==(const cell& a, const cell& b)
     // check if all faces on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index 943686204e..f7b33d65df 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -54,7 +54,7 @@ Foam::label Foam::cell::opposingFaceLabel
 
     label oppositeFaceLabel = -1;
 
-    forAll (curFaceLabels, faceI)
+    forAll(curFaceLabels, faceI)
     {
         // Compare the face with the master
         const face& curFace = meshFaces[curFaceLabels[faceI]];
@@ -70,11 +70,11 @@ Foam::label Foam::cell::opposingFaceLabel
 
             // Compare every vertex of the current face agains the
             // vertices of the master face
-            forAll (curFace, pointI)
+            forAll(curFace, pointI)
             {
                 const label l = curFace[pointI];
 
-                forAll (masterFace, masterPointI)
+                forAll(masterFace, masterPointI)
                 {
                     if (masterFace[masterPointI] == l)
                     {
@@ -149,11 +149,11 @@ Foam::oppositeFace Foam::cell::opposingFace
             oppFaceLabel
         );
 
-        forAll (masterFace, pointI)
+        forAll(masterFace, pointI)
         {
             // Go through the list of edges and find the edge from this vertex
             // to the slave face
-            forAll (e, edgeI)
+            forAll(e, edgeI)
             {
                 if (!usedEdges[edgeI])
                 {
@@ -166,7 +166,7 @@ Foam::oppositeFace Foam::cell::opposingFace
                         // Found an edge coming from this vertex.
                         // Check all vertices of the slave to find out
                         // if it exists.
-                        forAll (slaveFace, slavePointI)
+                        forAll(slaveFace, slavePointI)
                         {
                             if (slaveFace[slavePointI] == otherVertex)
                             {
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index 55afe5c9e0..91454b95f4 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -123,14 +123,9 @@ Foam::label Foam::cellMatcher::calcLocalFaces
     }
 
     // Create local to global vertex mapping
-    for
-    (
-        Map<label>::iterator iter = localPoint_.begin();
-        iter != localPoint_.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, localPoint_, iter)
     {
-        label fp = iter();
+        const label fp = iter();
         pointMap_[fp] = iter.key();
     }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
index f07b77e5f1..f47909cbc8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
@@ -107,7 +107,7 @@ inline faceList cellModel::faces(const labelList& pointLabels) const
 
          curFace.setSize(curModelLabels.size());
 
-         forAll (curModelLabels, labelI)
+         forAll(curModelLabels, labelI)
          {
              curFace[labelI] = pointLabels[curModelLabels[labelI]];
          }
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 0f8829bd2e..84d90959a0 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -322,7 +322,7 @@ int Foam::face::compare(const face& a, const face& b)
     const label firstA = a[0];
     label Bptr = -1;
 
-    forAll (b, i)
+    forAll(b, i)
     {
         if (b[i] == firstA)
         {
@@ -621,7 +621,7 @@ Foam::label Foam::face::which(const label globalIndex) const
     label pointInFace = -1;
     const labelList& f = *this;
 
-    forAll (f, i)
+    forAll(f, i)
     {
         if (f[i] == globalIndex)
         {
@@ -750,7 +750,7 @@ Foam::edgeList Foam::face::edges() const
 
 int Foam::face::edgeDirection(const edge& e) const
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         if (operator[](i) == e.start())
         {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index ae6ca88f0e..3d587b74e1 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -43,7 +43,7 @@ Foam::scalar Foam::face::areaInContact
 
     scalarField vertexValue(labels.size());
 
-    forAll (labels, i)
+    forAll(labels, i)
     {
         vertexValue[i] = v[labels[i]];
     }
@@ -56,7 +56,7 @@ Foam::scalar Foam::face::areaInContact
     bool allPositive = true;
     bool allNegative = true;
 
-    forAll (vertexValue, vI)
+    forAll(vertexValue, vI)
     {
         if (vertexValue[vI] > 0)
         {
@@ -147,7 +147,7 @@ Foam::scalar Foam::face::areaInContact
     // Make a labelList for the sub-face (points are ordered!)
     labelList sfl(newFacePoints.size());
 
-    forAll (sfl, sflI)
+    forAll(sfl, sflI)
     {
         sfl[sflI] = sflI;
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
index 00b97a17ab..b1655afa94 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
@@ -73,7 +73,7 @@ public:
         {
             const pointBoundaryMesh& patches = mesh.boundary();
 
-            forAll (patches, patchI)
+            forAll(patches, patchI)
             {
                 set
                 (
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index cc72dc0649..2624b84829 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -63,7 +63,7 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll (directAddr, pointI)
+        forAll(directAddr, pointI)
         {
             if (directAddr[pointI] < 0)
             {
@@ -89,7 +89,7 @@ void Foam::pointMapper::calcAddressing() const
         // Points created from other points (i.e. points merged into it).
         const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             // Get addressing
             const labelList& mo = cfc[cfcI].masterObjects();
@@ -115,7 +115,7 @@ void Foam::pointMapper::calcAddressing() const
 
         const labelList& cm = mpm_.pointMap();
 
-        forAll (cm, pointI)
+        forAll(cm, pointI)
         {
             if (cm[pointI] > -1 && addr[pointI].empty())
             {
@@ -132,7 +132,7 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll (addr, pointI)
+        forAll(addr, pointI)
         {
             if (addr[pointI].empty())
             {
@@ -198,7 +198,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
 
         const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             cm[cfc[cfcI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
index 38efebd458..78d961cc48 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
@@ -62,7 +62,7 @@ void Foam::processorPointPatch::initGeometry(PstreamBuffers& pBufs)
 
     faceList masterFaces(pp.size());
 
-    forAll (pp, faceI)
+    forAll(pp, faceI)
     {
         masterFaces[faceI] = pp[faceI].reverseFace();
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 88d02457de..0131ffd7f1 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -64,7 +64,7 @@ void Foam::globalMeshData::initProcAddr()
 
     label nNeighbours = 0;
 
-    forAll (mesh_.boundaryMesh(), patchi)
+    forAll(mesh_.boundaryMesh(), patchi)
     {
         if (isA<processorPolyPatch>(mesh_.boundaryMesh()[patchi]))
         {
@@ -78,7 +78,7 @@ void Foam::globalMeshData::initProcAddr()
     if (Pstream::parRun())
     {
         // Send indices of my processor patches to my neighbours
-        forAll (processorPatches_, i)
+        forAll(processorPatches_, i)
         {
             label patchi = processorPatches_[i];
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 192b09d72f..0489d57ded 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -63,7 +63,7 @@ void Foam::cellMapper::calcAddressing() const
 
         label nInsertedCells = 0;
 
-        forAll (directAddr, cellI)
+        forAll(directAddr, cellI)
         {
             if (directAddr[cellI] < 0)
             {
@@ -88,7 +88,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
-        forAll (cfp, cfpI)
+        forAll(cfp, cfpI)
         {
             // Get addressing
             const labelList& mo = cfp[cfpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
 
-        forAll (cfe, cfeI)
+        forAll(cfe, cfeI)
         {
             // Get addressing
             const labelList& mo = cfe[cfeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cff = mpm_.cellsFromFacesMap();
 
-        forAll (cff, cffI)
+        forAll(cff, cffI)
         {
             // Get addressing
             const labelList& mo = cff[cffI].masterObjects();
@@ -154,7 +154,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             // Get addressing
             const labelList& mo = cfc[cfcI].masterObjects();
@@ -180,7 +180,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const labelList& cm = mpm_.cellMap();
 
-        forAll (cm, cellI)
+        forAll(cm, cellI)
         {
             if (cm[cellI] > -1 && addr[cellI].empty())
             {
@@ -197,7 +197,7 @@ void Foam::cellMapper::calcAddressing() const
 
         label nInsertedCells = 0;
 
-        forAll (addr, cellI)
+        forAll(addr, cellI)
         {
             if (addr[cellI].empty())
             {
@@ -270,28 +270,28 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
 
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
-        forAll (cfp, cfpI)
+        forAll(cfp, cfpI)
         {
             cm[cfp[cfpI].index()] = 0;
         }
 
         const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
 
-        forAll (cfe, cfeI)
+        forAll(cfe, cfeI)
         {
             cm[cfe[cfeI].index()] = 0;
         }
 
         const List<objectMap>& cff = mpm_.cellsFromFacesMap();
 
-        forAll (cff, cffI)
+        forAll(cff, cffI)
         {
             cm[cff[cffI].index()] = 0;
         }
 
         const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             cm[cfc[cfcI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index bbe15fbd30..a59d6f8fff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -63,7 +63,7 @@ void Foam::faceMapper::calcAddressing() const
 
         label nInsertedFaces = 0;
 
-        forAll (directAddr, faceI)
+        forAll(directAddr, faceI)
         {
             if (directAddr[faceI] < 0)
             {
@@ -88,7 +88,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& ffp = mpm_.facesFromPointsMap();
 
-        forAll (ffp, ffpI)
+        forAll(ffp, ffpI)
         {
             // Get addressing
             const labelList& mo = ffp[ffpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
 
-        forAll (ffe, ffeI)
+        forAll(ffe, ffeI)
         {
             // Get addressing
             const labelList& mo = ffe[ffeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& fff = mpm_.facesFromFacesMap();
 
-        forAll (fff, fffI)
+        forAll(fff, fffI)
         {
             // Get addressing
             const labelList& mo = fff[fffI].masterObjects();
@@ -157,7 +157,7 @@ void Foam::faceMapper::calcAddressing() const
         // so check if addressing size still zero.
         const labelList& fm = mpm_.faceMap();
 
-        forAll (fm, faceI)
+        forAll(fm, faceI)
         {
             if (fm[faceI] > -1 && addr[faceI].empty())
             {
@@ -175,7 +175,7 @@ void Foam::faceMapper::calcAddressing() const
 
         label nInsertedFaces = 0;
 
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (addr[faceI].empty())
             {
@@ -247,21 +247,21 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
 
         const List<objectMap>& ffp = mpm_.facesFromPointsMap();
 
-        forAll (ffp, ffpI)
+        forAll(ffp, ffpI)
         {
             fm[ffp[ffpI].index()] = 0;
         }
 
         const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
 
-        forAll (ffe, ffeI)
+        forAll(ffe, ffeI)
         {
             fm[ffe[ffeI].index()] = 0;
         }
 
         const List<objectMap>& fff = mpm_.facesFromFacesMap();
 
-        forAll (fff, fffI)
+        forAll(fff, fffI)
         {
             fm[fff[fffI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 9cd769422d..1c351ab61d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -120,7 +120,7 @@ Foam::polyBoundaryMesh::~polyBoundaryMesh()
 
 void Foam::polyBoundaryMesh::clearGeom()
 {
-    forAll (*this, patchi)
+    forAll(*this, patchi)
     {
         operator[](patchi).clearGeom();
     }
@@ -132,7 +132,7 @@ void Foam::polyBoundaryMesh::clearAddressing()
     neighbourEdgesPtr_.clear();
     patchIDPtr_.clear();
 
-    forAll (*this, patchi)
+    forAll(*this, patchi)
     {
         operator[](patchi).clearAddressing();
     }
@@ -355,7 +355,7 @@ Foam::wordList Foam::polyBoundaryMesh::names() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].name();
     }
@@ -370,7 +370,7 @@ Foam::wordList Foam::polyBoundaryMesh::types() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].type();
     }
@@ -385,7 +385,7 @@ Foam::wordList Foam::polyBoundaryMesh::physicalTypes() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].physicalType();
     }
@@ -398,7 +398,7 @@ Foam::label Foam::polyBoundaryMesh::findPatchID(const word& patchName) const
 {
     const polyPatchList& patches = *this;
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         if (patches[patchI].name() == patchName)
         {
@@ -440,7 +440,7 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
         return -1;
     }
 
-    forAll (*this, patchI)
+    forAll(*this, patchI)
     {
         const polyPatch& bp = operator[](patchI);
 
@@ -518,7 +518,7 @@ bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
 
     label nonProcI = 0;
 
-    forAll (bm, patchI)
+    forAll(bm, patchI)
     {
         if (!isA<processorPolyPatch>(bm[patchI]))
         {
@@ -594,7 +594,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const
 
     bool hasError = false;
 
-    forAll (bm, patchI)
+    forAll(bm, patchI)
     {
         if (bm[patchI].start() != nextPatchStart && !hasError)
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index b459de044e..9bb7f27fa5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -438,7 +438,7 @@ Foam::polyMesh::polyMesh
     oldPointsPtr_(NULL)
 {
     // Check if the faces and cells are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -594,7 +594,7 @@ Foam::polyMesh::polyMesh
     oldPointsPtr_(NULL)
 {
     // Check if faces are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -619,7 +619,7 @@ Foam::polyMesh::polyMesh
     cellList cLst(cells);
 
     // Check if cells are valid
-    forAll (cLst, cellI)
+    forAll(cLst, cellI)
     {
         const cell& curCell = cLst[cellI];
 
@@ -701,7 +701,7 @@ void Foam::polyMesh::resetPrimitives
     setInstance(time().timeName());
 
     // Check if the faces and cells are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -866,7 +866,7 @@ void Foam::polyMesh::addPatches
     boundary_.setSize(p.size());
 
     // Copy the patch pointers
-    forAll (p, pI)
+    forAll(p, pI)
     {
         boundary_.set(pI, p[pI]);
     }
@@ -918,7 +918,7 @@ void Foam::polyMesh::addZones
         pointZones_.setSize(pz.size());
 
         // Copy the zone pointers
-        forAll (pz, pI)
+        forAll(pz, pI)
         {
             pointZones_.set(pI, pz[pI]);
         }
@@ -932,7 +932,7 @@ void Foam::polyMesh::addZones
         faceZones_.setSize(fz.size());
 
         // Copy the zone pointers
-        forAll (fz, fI)
+        forAll(fz, fI)
         {
             faceZones_.set(fI, fz[fI]);
         }
@@ -946,7 +946,7 @@ void Foam::polyMesh::addZones
         cellZones_.setSize(cz.size());
 
         // Copy the zone pointers
-        forAll (cz, cI)
+        forAll(cz, cI)
         {
             cellZones_.set(cI, cz[cI]);
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index d4fc6a8079..88fc61fe13 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -62,7 +62,7 @@ void Foam::polyMesh::clearGeom()
 
     primitiveMesh::clearGeom();
 
-    forAll (boundary_, patchI)
+    forAll(boundary_, patchI)
     {
         boundary_[patchI].clearGeom();
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 4fd9c4626a..464ed465b0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -61,7 +61,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
 
     labelListList pointCellAddr(pc.size());
 
-    forAll (pc, pointI)
+    forAll(pc, pointI)
     {
         pointCellAddr[pointI].transfer(pc[pointI]);
     }
@@ -384,7 +384,7 @@ Foam::polyMesh::polyMesh
             label nextNei = -1;
             label minNei = cells.size();
 
-            forAll (neiCells, ncI)
+            forAll(neiCells, ncI)
             {
                 if (neiCells[ncI] > -1 && neiCells[ncI] < minNei)
                 {
@@ -433,7 +433,7 @@ Foam::polyMesh::polyMesh
     labelList patchSizes(boundaryFaces.size(), -1);
     labelList patchStarts(boundaryFaces.size(), -1);
 
-    forAll (boundaryFaces, patchI)
+    forAll(boundaryFaces, patchI)
     {
         const faceList& patchFaces = boundaryFaces[patchI];
 
@@ -449,7 +449,7 @@ Foam::polyMesh::polyMesh
         // Grab the start label
         label curPatchStart = nFaces;
 
-        forAll (patchFaces, faceI)
+        forAll(patchFaces, faceI)
         {
             const face& curFace = patchFaces[faceI];
 
@@ -462,7 +462,7 @@ Foam::polyMesh::polyMesh
 
             bool found = false;
 
-            forAll (facesOfCellInside, cellFaceI)
+            forAll(facesOfCellInside, cellFaceI)
             {
                 if (facesOfCellInside[cellFaceI] == curFace)
                 {
@@ -541,7 +541,7 @@ Foam::polyMesh::polyMesh
 
     // Warning: Patches can only be added once the face list is
     // completed, as they hold a subList of the face list
-    forAll (boundaryFaces, patchI)
+    forAll(boundaryFaces, patchI)
     {
         // add the patch to the list
         boundary_.set
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 9c437bdaaa..5dcb2464c7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -185,7 +185,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             wordList oldTypes = boundary_.types();
             wordList oldNames = boundary_.names();
 
-            forAll (oldTypes, patchI)
+            forAll(oldTypes, patchI)
             {
                 if
                 (
@@ -208,14 +208,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             boundary_.clear();
             boundary_.setSize(newBoundary.size());
 
-            forAll (newBoundary, patchI)
+            forAll(newBoundary, patchI)
             {
                 boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
             }
         }
         else
         {
-            forAll (boundary_, patchI)
+            forAll(boundary_, patchI)
             {
                 boundary_[patchI] = polyPatch
                 (
@@ -296,7 +296,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (pointZones_, czI)
+        forAll(pointZones_, czI)
         {
             pointZones_[czI] = newPointZones[czI];
         }
@@ -333,7 +333,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (faceZones_, fzI)
+        forAll(faceZones_, fzI)
         {
             faceZones_[fzI].resetAddressing
             (
@@ -374,7 +374,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (cellZones_, czI)
+        forAll(cellZones_, czI)
         {
             cellZones_[czI] = newCellZones[czI];
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index 97bf542371..f732de64b2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -111,7 +111,7 @@ void Foam::polyMesh::initMesh(cellList& c)
         // get reference to face labels for current cell
         const labelList& cellfaces = c[cellI];
 
-        forAll (cellfaces, faceI)
+        forAll(cellfaces, faceI)
         {
             if (!markedFaces[cellfaces[faceI]])
             {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index fee9dc2da7..26b892921e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -308,7 +308,7 @@ void Foam::coupledPolyPatch::calcTransformTensors
             collocated_.setSize(Cf.size());
             collocated_ = false;
 
-            forAll (forwardT_, facei)
+            forAll(forwardT_, facei)
             {
                 forwardT_[facei] = rotationTensor(-nr[facei], nf[facei]);
                 reverseT_[facei] = rotationTensor(nf[facei], -nr[facei]);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 8c0d66de3f..ba2067b907 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -123,12 +123,7 @@ void Foam::genericPolyPatch::write(Ostream& os) const
     os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
     os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if
         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index fa35e02e76..37fa6df999 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -275,7 +275,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
 
     const unallocLabelList& faceCells = this->faceCells();
 
-    forAll (faceCells, facei)
+    forAll(faceCells, facei)
     {
         cc[facei] = gcc[faceCells[facei]];
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 546c4bef1a..7ad51549b1 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -50,7 +50,7 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
         // Count number of objects in all zones
         label nObjects = 0;
 
-        forAll (*this, zoneI)
+        forAll(*this, zoneI)
         {
             nObjects += this->operator[](zoneI).size();
         }
@@ -60,11 +60,11 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
 
         // Fill in objects of all zones into the map.  The key is the global
         // object index and the result is the zone index
-        forAll (*this, zoneI)
+        forAll(*this, zoneI)
         {
             const labelList& zoneObjects = this->operator[](zoneI);
 
-            forAll (zoneObjects, objI)
+            forAll(zoneObjects, objI)
             {
                 zm.insert(zoneObjects[objI], zoneI);
             }
@@ -201,7 +201,7 @@ wordList ZoneMesh<ZoneType, MeshType>::types() const
 
     wordList t(zones.size());
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         t[zoneI] = zones[zoneI].type();
     }
@@ -218,7 +218,7 @@ wordList ZoneMesh<ZoneType, MeshType>::names() const
 
     wordList t(zones.size());
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         t[zoneI] = zones[zoneI].name();
     }
@@ -232,7 +232,7 @@ label ZoneMesh<ZoneType, MeshType>::findZoneID(const word& zoneName) const
 {
     const PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         if (zones[zoneI].name() == zoneName)
         {
@@ -261,7 +261,7 @@ void ZoneMesh<ZoneType, MeshType>::clearAddressing()
 
     PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         zones[zoneI].clearAddressing();
     }
@@ -284,7 +284,7 @@ bool ZoneMesh<ZoneType, MeshType>::checkDefinition(const bool report) const
 
     const PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         inError |= zones[zoneI].checkDefinition(report);
     }
@@ -298,7 +298,7 @@ void ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p)
 {
     PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         zones[zoneI].movePoints(p);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 5e900f8fed..8c5b79e80a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -77,7 +77,7 @@ void Foam::faceZone::calcFaceZonePatch() const
     const labelList& addr = *this;
     const boolList& flip = flipMap();
 
-    forAll (addr, faceI)
+    forAll(addr, faceI)
     {
         if (flip[faceI])
         {
@@ -133,7 +133,7 @@ void Foam::faceZone::calcCellLayers() const
         slaveCellsPtr_ = new labelList(mf.size());
         labelList& sc = *slaveCellsPtr_;
 
-        forAll (mf, faceI)
+        forAll(mf, faceI)
         {
             label ownCellI = own[mf[faceI]];
             label neiCellI =
@@ -346,7 +346,7 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
         //
         //const labelList& faceLabels = *this;
         //
-        //forAll (faceCells, faceI)
+        //forAll(faceCells, faceI)
         //{
         //    faceCells[faceI] = own[faceLabels[faceI]];
         //}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 9c3d10619d..8722ab98ac 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -78,7 +78,7 @@ calcAddressing() const
 
     // Guess the max number of edges and neighbours for a face
     label maxEdges = 0;
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         maxEdges += locFcs[faceI].size();
     }
@@ -103,14 +103,14 @@ calcAddressing() const
     // initialise the lists of subshapes for each face to avoid duplication
     edgeListList faceIntoEdges(locFcs.size());
 
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         faceIntoEdges[faceI] = locFcs[faceI].edges();
 
         labelList& curFaceEdges = faceEdges[faceI];
         curFaceEdges.setSize(faceIntoEdges[faceI].size());
 
-        forAll (curFaceEdges, faceEdgeI)
+        forAll(curFaceEdges, faceEdgeI)
         {
             curFaceEdges[faceEdgeI] = -1;
         }
@@ -128,7 +128,7 @@ calcAddressing() const
     // in face (i.e. curEdges[0] is edge between f[0] and f[1])
 
     // For all local faces ...
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         // Get reference to vertices of current face and corresponding edges.
         const Face& curF = locFcs[faceI];
@@ -141,7 +141,7 @@ calcAddressing() const
         label nNeighbours = 0;
 
         // For all edges ...
-        forAll (curEdges, edgeI)
+        forAll(curEdges, edgeI)
         {
             // If the edge is already detected, skip
             if (faceEdges[faceI][edgeI] >= 0) continue;
@@ -155,7 +155,7 @@ calcAddressing() const
 
             const labelList& nbrFaces = pf[e.start()];
 
-            forAll (nbrFaces, nbrFaceI)
+            forAll(nbrFaces, nbrFaceI)
             {
                 // set reference to the current neighbour
                 label curNei = nbrFaces[nbrFaceI];
@@ -166,7 +166,7 @@ calcAddressing() const
                     // get the reference to subshapes of the neighbour
                     const edgeList& searchEdges = faceIntoEdges[curNei];
 
-                    forAll (searchEdges, neiEdgeI)
+                    forAll(searchEdges, neiEdgeI)
                     {
                         if (searchEdges[neiEdgeI] == e)
                         {
@@ -204,7 +204,7 @@ calcAddressing() const
             label nextNei = -1;
             label minNei = locFcs.size();
 
-            forAll (neiFaces, nfI)
+            forAll(neiFaces, nfI)
             {
                 if (neiFaces[nfI].size() && neiFaces[nfI][0] < minNei)
                 {
@@ -229,7 +229,7 @@ calcAddressing() const
                 curEf.setSize(cnf.size() + 1);
                 curEf[0] = faceI;
 
-                forAll (cnf, cnfI)
+                forAll(cnf, cnfI)
                 {
                     faceEdges[cnf[cnfI]][eonf[cnfI]] = nEdges;
 
@@ -259,11 +259,11 @@ calcAddressing() const
 
     // Do boundary faces
 
-    forAll (faceEdges, faceI)
+    forAll(faceEdges, faceI)
     {
         labelList& curEdges = faceEdges[faceI];
 
-        forAll (curEdges, edgeI)
+        forAll(curEdges, edgeI)
         {
             if (curEdges[edgeI] < 0)
             {
@@ -291,7 +291,7 @@ calcAddressing() const
     faceFacesPtr_ = new labelListList(locFcs.size());
     labelListList& faceFaces = *faceFacesPtr_;
 
-    forAll (faceFaces, faceI)
+    forAll(faceFaces, faceI)
     {
         faceFaces[faceI].transfer(ff[faceI]);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 5e7cc45fa4..d9d1239a81 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -80,7 +80,7 @@ calcLocalPointOrder() const
 
     label nPoints = 0;
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         if (!visitedFace[faceI])
         {
@@ -99,7 +99,7 @@ calcLocalPointOrder() const
                     const labelList& curPoints = lf[curFace];
 
                     // mark points
-                    forAll (curPoints, pointI)
+                    forAll(curPoints, pointI)
                     {
                         if (!visitedPoint[curPoints[pointI]])
                         {
@@ -114,7 +114,7 @@ calcLocalPointOrder() const
                     // add face neighbours to the list
                     const labelList& nbrs = ff[curFace];
 
-                    forAll (nbrs, nbrI)
+                    forAll(nbrs, nbrI)
                     {
                         if (!visitedFace[nbrs[nbrI]])
                         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
index 66661c3f76..480cb3402b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
@@ -67,7 +67,7 @@ meshEdges
 
     // WARNING: Remember that local edges address into local point list;
     // local-to-global point label translation is necessary
-    forAll (PatchEdges, edgeI)
+    forAll(PatchEdges, edgeI)
     {
         const edge curEdge
             (pp[PatchEdges[edgeI].start()], pp[PatchEdges[edgeI].end()]);
@@ -77,7 +77,7 @@ meshEdges
         // get the patch faces sharing the edge
         const labelList& curFaces = EdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // get the cell next to the face
             label curCell = faceCells[curFaces[faceI]];
@@ -85,7 +85,7 @@ meshEdges
             // get reference to edges on the cell
             const labelList& ce = cellEdges[curCell];
 
-            forAll (ce, cellEdgeI)
+            forAll(ce, cellEdgeI)
             {
                 if (allEdges[ce[cellEdgeI]] == curEdge)
                 {
@@ -139,14 +139,14 @@ meshEdges
 
     // WARNING: Remember that local edges address into local point list;
     // local-to-global point label translation is necessary
-    forAll (PatchEdges, edgeI)
+    forAll(PatchEdges, edgeI)
     {
         const label globalPointI = pp[PatchEdges[edgeI].start()];
         const edge curEdge(globalPointI, pp[PatchEdges[edgeI].end()]);
 
         const labelList& pe = pointEdges[globalPointI];
 
-        forAll (pe, i)
+        forAll(pe, i)
         {
             if (allEdges[pe[i]] == curEdge)
             {
@@ -183,7 +183,7 @@ whichEdge
     {
         const labelList& pe = pointEdges()[e.start()];
 
-        forAll (pe, peI)
+        forAll(pe, peI)
         {
             if (e == Edges[pe[peI]])
             {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index f73eae1221..b87a462e0f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -67,7 +67,7 @@ calcPointEdges() const
     // set up storage for pointEdges
     List<SLList<label> > pointEdges(meshPoints().size());
 
-    forAll (e, edgeI)
+    forAll(e, edgeI)
     {
         pointEdges[e[edgeI].start()].append(edgeI);
         pointEdges[e[edgeI].end()].append(edgeI);
@@ -78,19 +78,14 @@ calcPointEdges() const
 
     labelListList& pe = *pointEdgesPtr_;
 
-    forAll (pointEdges, pointI)
+    forAll(pointEdges, pointI)
     {
         pe[pointI].setSize(pointEdges[pointI].size());
 
         label i = 0;
-        for
-        (
-            SLList<label>::iterator curEdgesIter = pointEdges[pointI].begin();
-            curEdgesIter != pointEdges[pointI].end();
-            ++curEdgesIter, ++i
-        )
+        forAllIter(SLList<label>, pointEdges[pointI], curEdgesIter)
         {
-            pe[pointI][i] = curEdgesIter();
+            pe[pointI][i++] = curEdgesIter();
         }
     }
 
@@ -138,11 +133,11 @@ calcPointFaces() const
     // set up storage for pointFaces
     List<SLList<label> > pointFcs(meshPoints().size());
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         const Face& curPoints = f[faceI];
 
-        forAll (curPoints, pointI)
+        forAll(curPoints, pointI)
         {
             pointFcs[curPoints[pointI]].append(faceI);
         }
@@ -153,19 +148,14 @@ calcPointFaces() const
 
     labelListList& pf = *pointFacesPtr_;
 
-    forAll (pointFcs, pointI)
+    forAll(pointFcs, pointI)
     {
         pf[pointI].setSize(pointFcs[pointI].size());
 
         label i = 0;
-        for
-        (
-            SLList<label>::iterator curFacesIter = pointFcs[pointI].begin();
-            curFacesIter != pointFcs[pointI].end();
-            ++curFacesIter, ++i
-        )
+        forAllIter(SLList<label>, pointFcs[pointI], curFacesIter)
         {
-            pf[pointI][i] = curFacesIter();
+            pf[pointI][i++] = curFacesIter();
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index d58231f7ec..a3522bbf83 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -84,7 +84,7 @@ projectPoints
     // Estimate face centre of target side
     Field<PointType> masterFaceCentres(targetPatch.size());
 
-    forAll (masterFaceCentres, faceI)
+    forAll(masterFaceCentres, faceI)
     {
         masterFaceCentres[faceI] =
             average(masterFaces[faceI].points(masterPoints));
@@ -101,7 +101,7 @@ projectPoints
     label curFace = 0;
     label nNSquaredSearches = 0;
 
-    forAll (slavePointOrder, pointI)
+    forAll(slavePointOrder, pointI)
     {
         // Pick up slave point and direction
         const label curLocalPointLabel = slavePointOrder[pointI];
@@ -179,7 +179,7 @@ projectPoints
                     sqrDistance =
                         magSqr(missPlanePoint - masterFaceCentres[curFace]);
 
-                    forAll (masterNbrs, nbrI)
+                    forAll(masterNbrs, nbrI)
                     {
                         if
                         (
@@ -224,7 +224,7 @@ projectPoints
             result[curLocalPointLabel] = objectHit(false, -1);
             scalar minDistance = GREAT;
 
-            forAll (masterFaces, faceI)
+            forAll(masterFaces, faceI)
             {
                 PointHit<PointType> curHit =
                     masterFaces[faceI].ray
@@ -325,7 +325,7 @@ projectFaceCentres
 
     const typename ToPatch::PointFieldType& masterPoints = targetPatch.points();
 
-    forAll (masterFaceCentres, faceI)
+    forAll(masterFaceCentres, faceI)
     {
         masterFaceCentres[faceI] =
             masterFaces[faceI].centre(masterPoints);
@@ -348,7 +348,7 @@ projectFaceCentres
     label curFace = 0;
     label nNSquaredSearches = 0;
 
-    forAll (slaveFaceOrder, faceI)
+    forAll(slaveFaceOrder, faceI)
     {
         // pick up slave point and direction
         const label curLocalFaceLabel = slaveFaceOrder[faceI];
@@ -425,7 +425,7 @@ projectFaceCentres
 
                     const labelList& masterNbrs = masterFaceFaces[curFace];
 
-                    forAll (masterNbrs, nbrI)
+                    forAll(masterNbrs, nbrI)
                     {
                         if
                         (
@@ -467,7 +467,7 @@ projectFaceCentres
             result[curLocalFaceLabel] = objectHit(false, -1);
             scalar minDistance = GREAT;
 
-            forAll (masterFaces, faceI)
+            forAll(masterFaces, faceI)
             {
                 PointHit<PointType> curHit =
                     masterFaces[faceI].ray
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
index d72ae8526e..803160e8be 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
@@ -49,7 +49,7 @@ void Foam::primitiveMesh::calcCellShapes() const
         cellShapesPtr_ = new cellShapeList(nCells());
         cellShapeList& cellShapes = *cellShapesPtr_;
 
-        forAll (cellShapes, celli)
+        forAll(cellShapes, celli)
         {
             cellShapes[celli] = degenerateMatcher::match(*this, celli);
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index e4486bb637..a698a80833 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -63,7 +63,7 @@ void Foam::primitiveMesh::calcCellCells() const
         const labelList& own = faceOwner();
         const labelList& nei = faceNeighbour();
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             ncc[own[faceI]]++;
             ncc[nei[faceI]]++;
@@ -77,13 +77,13 @@ void Foam::primitiveMesh::calcCellCells() const
 
         // 2. Size and fill cellFaceAddr
 
-        forAll (cellCellAddr, cellI)
+        forAll(cellCellAddr, cellI)
         {
             cellCellAddr[cellI].setSize(ncc[cellI]);
         }
         ncc = 0;
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             label ownCellI = own[faceI];
             label neiCellI = nei[faceI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 0d49452c0d..fd38491dfa 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -90,13 +90,13 @@ void Foam::primitiveMesh::makeCellCentresAndVols
     vectorField cEst(nCells(), vector::zero);
     labelField nCellFaces(nCells(), 0);
 
-    forAll (own, facei)
+    forAll(own, facei)
     {
         cEst[own[facei]] += fCtrs[facei];
         nCellFaces[own[facei]] += 1;
     }
 
-    forAll (nei, facei)
+    forAll(nei, facei)
     {
         cEst[nei[facei]] += fCtrs[facei];
         nCellFaces[nei[facei]] += 1;
@@ -107,7 +107,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
         cEst[celli] /= nCellFaces[celli];
     }
 
-    forAll (own, facei)
+    forAll(own, facei)
     {
         // Calculate 3*face-pyramid volume
         scalar pyr3Vol =
@@ -123,7 +123,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
         cellVols[own[facei]] += pyr3Vol;
     }
 
-    forAll (nei, facei)
+    forAll(nei, facei)
     {
         // Calculate 3*face-pyramid volume
         scalar pyr3Vol =
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 08d3c6c5b5..98cec1c337 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -69,13 +69,13 @@ void Foam::primitiveMesh::calcCellEdges() const
         const labelListList& fe = faceEdges();
 
         // loop through the list again and add edges; checking for duplicates
-        forAll (own, faceI)
+        forAll(own, faceI)
         {
             DynamicList<label, edgesPerCell_>& curCellEdges = ce[own[faceI]];
 
             const labelList& curEdges = fe[faceI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
                 {
@@ -85,13 +85,13 @@ void Foam::primitiveMesh::calcCellEdges() const
             }
         }
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             DynamicList<label, edgesPerCell_>& curCellEdges = ce[nei[faceI]];
 
             const labelList& curEdges = fe[faceI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
                 {
@@ -105,7 +105,7 @@ void Foam::primitiveMesh::calcCellEdges() const
         labelListList& cellEdgeAddr = *cePtr_;
 
         // reset the size
-        forAll (ce, cellI)
+        forAll(ce, cellI)
         {
             cellEdgeAddr[cellI].transfer(ce[cellI]);
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index a117022bb0..f814bd1eef 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -52,12 +52,12 @@ void Foam::primitiveMesh::calcCells
 
     labelList ncf(nCells, 0);
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         ncf[own[faceI]]++;
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         if (nei[faceI] >= 0)
         {
@@ -71,20 +71,20 @@ void Foam::primitiveMesh::calcCells
 
     // 2. Size and fill cellFaceAddr
 
-    forAll (cellFaceAddr, cellI)
+    forAll(cellFaceAddr, cellI)
     {
         cellFaceAddr[cellI].setSize(ncf[cellI]);
     }
     ncf = 0;
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         label cellI = own[faceI];
 
         cellFaceAddr[cellI][ncf[cellI]++] = faceI;
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         label cellI = nei[faceI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index f28e9affd0..b60caa78d2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -113,7 +113,7 @@ bool Foam::primitiveMesh::checkClosedCells
 
     label nErrorClosed = 0;
 
-    forAll (c, cI)
+    forAll(c, cI)
     {
         const cell& curCell = c[cI];
 
@@ -149,14 +149,14 @@ bool Foam::primitiveMesh::checkClosedCells
     const labelList& nei = faceNeighbour();
     const vectorField& areas = faceAreas();
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         // Add to owner
         sumClosed[own[faceI]] += areas[faceI];
         sumMagClosed[own[faceI]] += cmptMag(areas[faceI]);
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         // Subtract from neighbour
         sumClosed[nei[faceI]] -= areas[faceI];
@@ -172,7 +172,7 @@ bool Foam::primitiveMesh::checkClosedCells
     const scalarField& vols = cellVolumes();
 
     // Check the sums
-    forAll (sumClosed, cellI)
+    forAll(sumClosed, cellI)
     {
         scalar maxOpenness = 0;
 
@@ -281,7 +281,7 @@ bool Foam::primitiveMesh::checkFaceAreas
     scalar minArea = GREAT;
     scalar maxArea = -GREAT;
 
-    forAll (magFaceAreas, faceI)
+    forAll(magFaceAreas, faceI)
     {
         if (magFaceAreas[faceI] < VSMALL)
         {
@@ -342,7 +342,7 @@ bool Foam::primitiveMesh::checkCellVolumes
 
     label nNegVolCells = 0;
 
-    forAll (vols, cellI)
+    forAll(vols, cellI)
     {
         if (vols[cellI] < VSMALL)
         {
@@ -421,7 +421,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
 
     label errorNonOrth = 0;
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         const vector& s = areas[faceI];
@@ -534,7 +534,7 @@ bool Foam::primitiveMesh::checkFacePyramids
 
     label nErrorPyrs = 0;
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         // Create the owner pyramid - it will have negative volume
         scalar pyrVol = pyramidPointFaceRef(f[faceI], ctrs[own[faceI]]).mag(p);
@@ -619,7 +619,7 @@ bool Foam::primitiveMesh::checkFaceTets
 
     label nErrorPyrs = 0;
 
-    forAll (fcs, faceI)
+    forAll(fcs, faceI)
     {
         // Create the owner tets - they will have negative volume
         const face& f = fcs[faceI];
@@ -863,7 +863,7 @@ bool Foam::primitiveMesh::checkPoints
 
     const labelListList& pf = pointFaces();
 
-    forAll (pf, pointI)
+    forAll(pf, pointI)
     {
         if (pf[pointI].empty())
         {
@@ -877,7 +877,7 @@ bool Foam::primitiveMesh::checkPoints
     }
 
 
-    forAll (pf, pointI)
+    forAll(pf, pointI)
     {
         const labelList& pc = pointCells(pointI);
 
@@ -1360,7 +1360,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
     // and add it to the check list (upper triangular order).
     // Once the list is completed, check it against the faceCell list
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -1498,7 +1498,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
     const faceList& f = faces();
     const cellList& c = cells();
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -1506,15 +1506,15 @@ bool Foam::primitiveMesh::checkCellsZipUp
 
         labelList edgeUsage(cellEdges.size(), 0);
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             edgeList curFaceEdges = f[curFaces[faceI]].edges();
 
-            forAll (curFaceEdges, faceEdgeI)
+            forAll(curFaceEdges, faceEdgeI)
             {
                 const edge& curEdge = curFaceEdges[faceEdgeI];
 
-                forAll (cellEdges, cellEdgeI)
+                forAll(cellEdges, cellEdgeI)
                 {
                     if (cellEdges[cellEdgeI] == curEdge)
                     {
@@ -1528,7 +1528,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
         edgeList singleEdges(cellEdges.size());
         label nSingleEdges = 0;
 
-        forAll (edgeUsage, edgeI)
+        forAll(edgeUsage, edgeI)
         {
             if (edgeUsage[edgeI] == 1)
             {
@@ -1599,7 +1599,7 @@ bool Foam::primitiveMesh::checkFaceVertices
 
     label nErrorFaces = 0;
 
-    forAll (f, fI)
+    forAll(f, fI)
     {
         const face& curFace = f[fI];
 
@@ -1995,7 +1995,7 @@ bool Foam::primitiveMesh::checkCellDeterminant
     scalar sumDet = 0;
     label nSummed = 0;
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -2114,7 +2114,7 @@ bool Foam::primitiveMesh::checkConcaveCells
 
     label nConcaveCells = 0;
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const cell& cFaces = c[cellI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
index 57bdf1a16b..3e6b006652 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
@@ -68,7 +68,7 @@ bool Foam::primitiveMesh::checkMeshMotion
     scalar minVolume = GREAT;
     label nNegVols = 0;
 
-    forAll (cellVols, cellI)
+    forAll(cellVols, cellI)
     {
         if (cellVols[cellI] < VSMALL)
         {
@@ -108,7 +108,7 @@ bool Foam::primitiveMesh::checkMeshMotion
     label nPyrErrors = 0;
     label nDotProductErrors = 0;
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         const scalar a = Foam::mag(fAreas[faceI]);
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 9b4bb9998f..5e25d94e36 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -79,7 +79,7 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
 {
     const faceList& fs = faces();
 
-    forAll (fs, facei)
+    forAll(fs, facei)
     {
         const labelList& f = fs[facei];
         label nPoints = f.size();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
index 4d30b3bbd5..8829a7e88e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
@@ -42,7 +42,7 @@ bool Foam::primitiveMesh::pointInCellBB(const point& p, label celli) const
     vector bbmax = -GREAT*vector::one;
     vector bbmin = GREAT*vector::one;
 
-    forAll (cellVertices, vertexI)
+    forAll(cellVertices, vertexI)
     {
         bbmax = max(bbmax, points[cellVertices[vertexI]]);
         bbmin = min(bbmin, points[cellVertices[vertexI]]);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index ebd136b6f7..905f1ff4b9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -63,11 +63,11 @@ void Foam::primitiveMesh::calcPointCells() const
 
         labelList npc(nPoints(), 0);
 
-        forAll (cf, cellI)
+        forAll(cf, cellI)
         {
             const labelList curPoints = cf[cellI].labels(faces());
 
-            forAll (curPoints, pointI)
+            forAll(curPoints, pointI)
             {
                 label ptI = curPoints[pointI];
 
@@ -81,18 +81,18 @@ void Foam::primitiveMesh::calcPointCells() const
         pcPtr_ = new labelListList(npc.size());
         labelListList& pointCellAddr = *pcPtr_;
 
-        forAll (pointCellAddr, pointI)
+        forAll(pointCellAddr, pointI)
         {
             pointCellAddr[pointI].setSize(npc[pointI]);
         }
         npc = 0;
 
 
-        forAll (cf, cellI)
+        forAll(cf, cellI)
         {
             const labelList curPoints = cf[cellI].labels(faces());
 
-            forAll (curPoints, pointI)
+            forAll(curPoints, pointI)
             {
                 label ptI = curPoints[pointI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index ee37aeab09..c7b6280f92 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -60,11 +60,11 @@ void Foam::primitiveMesh::calcPointPoints() const
         ppPtr_ = new labelListList(pe.size());
         labelListList& pp = *ppPtr_;
 
-        forAll (pe, pointI)
+        forAll(pe, pointI)
         {
             pp[pointI].setSize(pe[pointI].size());
 
-            forAll (pe[pointI], ppi)
+            forAll(pe[pointI], ppi)
             {
                 if (e[pe[pointI][ppi]].start() == pointI)
                 {
diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C
index 97877a24a2..fb77cc83de 100644
--- a/src/conversion/ensight/part/ensightPartFaces.C
+++ b/src/conversion/ensight/part/ensightPartFaces.C
@@ -79,7 +79,7 @@ Foam::ensightPartFaces::ensightPartFaces
     label nQuad = 0;
     label nPoly = 0;
 
-    forAll (pPatch, patchfaceI)
+    forAll(pPatch, patchfaceI)
     {
         const face& f = pMesh.faces()[patchfaceI + offset_];
 
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 0c850541a8..db018c7cea 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -127,7 +127,7 @@ void Foam::meshWriters::STARCD::getCellTable()
         // get the cellZone <-> cellTable correspondence
         Info<< "matching cellZones to cellTable" << endl;
 
-        forAll (mesh_.cellZones(), zoneI)
+        forAll(mesh_.cellZones(), zoneI)
         {
             const cellZone& cZone = mesh_.cellZones()[zoneI];
             if (cZone.size())
@@ -144,7 +144,7 @@ void Foam::meshWriters::STARCD::getCellTable()
                     tableId = cellTable_.append(dict);
                 }
 
-                forAll (cZone, i)
+                forAll(cZone, i)
                 {
                     cellTableId_[cZone[i]] = tableId;
                 }
@@ -159,7 +159,7 @@ void Foam::meshWriters::STARCD::getCellTable()
             dict.add("MaterialType", "fluid");
             label tableId = cellTable_.append(dict);
 
-            forAll (cellTableId_, i)
+            forAll(cellTableId_, i)
             {
                 if (cellTableId_[i] < 0)
                 {
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 1d0f84b70e..8375afe947 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -112,7 +112,7 @@ void Foam::attachDetach::checkDefinition()
 
             DynamicList<label> bouFacesInZone(addr.size());
 
-            forAll (addr, faceI)
+            forAll(addr, faceI)
             {
                 if (!mesh.isInternalFace(addr[faceI]))
                 {
@@ -180,7 +180,7 @@ void Foam::attachDetach::checkDefinition()
 
             DynamicList<label> zoneProblemFaces(addr.size());
 
-            forAll (addr, faceI)
+            forAll(addr, faceI)
             {
                 label facePatch =
                     mesh.boundaryMesh().whichPatch(addr[faceI]);
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index 04f9e233f0..8cf5c6f3e6 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -76,7 +76,7 @@ void Foam::attachDetach::calcPointMatchMap() const
 
     const label slavePatchStart = slavePatch.start();
 
-    forAll (reverseSlavePatch, faceI)
+    forAll(reverseSlavePatch, faceI)
     {
         reverseSlavePatch[faceI] =
             faces[slavePatchStart + faceI].reverseFace();
@@ -92,12 +92,12 @@ void Foam::attachDetach::calcPointMatchMap() const
     pointMatchMapPtr_ = new Map<label>(2*slaveMeshPoints.size());
     Map<label>& removedPointMap = *pointMatchMapPtr_;
 
-    forAll (masterLocalFaces, faceI)
+    forAll(masterLocalFaces, faceI)
     {
         const face& curMasterPoints = masterLocalFaces[faceI];
         const face& curSlavePoints = slaveLocalFaces[faceI];
 
-        forAll (curMasterPoints, pointI)
+        forAll(curMasterPoints, pointI)
         {
             // If the master and slave point labels are the same, the
             // point remains.  Otherwise, the slave point is removed and
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index c071637fb7..e195395e6a 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -81,7 +81,7 @@ void Foam::attachDetach::attachInterface
 
     const labelList removedPoints = removedPointMap.toc();
 
-    forAll (removedPoints, pointI)
+    forAll(removedPoints, pointI)
     {
         ref.setAction(polyRemovePoint(removedPoints[pointI]));
     }
@@ -100,7 +100,7 @@ void Foam::attachDetach::attachInterface
 
     const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
 
-    forAll (masterFaceCells, faceI)
+    forAll(masterFaceCells, faceI)
     {
         // If slave neighbour is greater than master, face does not need
         // turning.  Modify it to become internal
@@ -155,11 +155,11 @@ void Foam::attachDetach::attachInterface
 
     // Grab all the faces off the points in the slave patch.  If the face has
     //  not been removed, add it to the map of faces to renumber
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         const labelList& curFaces = pf[slaveMeshPoints[pointI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!ref.faceRemoved(curFaces[faceI]))
             {
@@ -171,7 +171,7 @@ void Foam::attachDetach::attachInterface
     // Grab the faces to be renumbered
     const labelList ftm = facesToModifyMap.toc();
 
-    forAll (ftm, faceI)
+    forAll(ftm, faceI)
     {
         // For every face to modify, copy the face and re-map the vertices.
         // It is known all the faces will be changed since they hang off
@@ -180,7 +180,7 @@ void Foam::attachDetach::attachInterface
 
         face newFace(faces[curFaceID]);
 
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::const_iterator rpmIter =
                 removedPointMap.find(newFace[pointI]);
@@ -267,7 +267,7 @@ void Foam::attachDetach::modifyMotionPoints
         // Calculate the difference in motion point positions
         scalar pointDiff = 0;
 
-        forAll (removedPoints, pointI)
+        forAll(removedPoints, pointI)
         {
             pointDiff +=
                 mag
@@ -284,7 +284,7 @@ void Foam::attachDetach::modifyMotionPoints
     }
 
     // Put the slave point on top of the master point
-    forAll (removedPoints, pointI)
+    forAll(removedPoints, pointI)
     {
         motionPoints[removedPoints[pointI]] =
             motionPoints[removedPointMap.find(removedPoints[pointI])()];
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index f1f6f41aff..4e80d42e00 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -127,7 +127,7 @@ void Foam::attachDetach::detachInterface
 
         bool edgeIsInternal = true;
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!mesh.isInternalFace(curFaces[faceI]))
             {
@@ -149,7 +149,7 @@ void Foam::attachDetach::detachInterface
 // Pout << "addedPoints before point creation: " << addedPoints << endl;
 
     // Create new points for face zone
-    forAll (addedPoints, pointI)
+    forAll(addedPoints, pointI)
     {
         if (addedPoints[pointI] < 0)
         {
@@ -181,7 +181,7 @@ void Foam::attachDetach::detachInterface
     const labelList& own = mesh.faceOwner();
     const labelList& nei = mesh.faceNeighbour();
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         const label curFaceID = mf[faceI];
 
@@ -190,7 +190,7 @@ void Foam::attachDetach::detachInterface
 
         face newFace(oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             newFace[pointI] = addedPoints[oldFace[pointI]];
         }
@@ -313,11 +313,11 @@ void Foam::attachDetach::detachInterface
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const labelList& curFaces = cells[mc[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the master patch; if not add it
             if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -333,7 +333,7 @@ void Foam::attachDetach::detachInterface
         // Make a map of master cells for quick reject
         labelHashSet mcMap(2*mc.size());
 
-        forAll (mc, mcI)
+        forAll(mc, mcI)
         {
             mcMap.insert(mc[mcI]);
         }
@@ -343,7 +343,7 @@ void Foam::attachDetach::detachInterface
         // faces to the map
         const labelList mcf = masterCellFaceMap.toc();
 
-        forAll (mcf, mcfI)
+        forAll(mcf, mcfI)
         {
             // Do the owner side
             const label ownCell = own[mcf[mcfI]];
@@ -353,7 +353,7 @@ void Foam::attachDetach::detachInterface
                 // Cell not found. Add its faces to the map
                 const cell& curFaces = cells[ownCell];
 
-                forAll (curFaces, faceI)
+                forAll(curFaces, faceI)
                 {
                     masterCellFaceMap.insert(curFaces[faceI]);
                 }
@@ -369,7 +369,7 @@ void Foam::attachDetach::detachInterface
                     // Cell not found. Add its faces to the map
                     const cell& curFaces = cells[neiCell];
 
-                    forAll (curFaces, faceI)
+                    forAll(curFaces, faceI)
                     {
                         masterCellFaceMap.insert(curFaces[faceI]);
                     }
@@ -381,7 +381,7 @@ void Foam::attachDetach::detachInterface
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         masterLayerPointMap.insert
         (
@@ -393,7 +393,7 @@ void Foam::attachDetach::detachInterface
     // Grab the list of faces of the master layer
     const labelList masterCellFaces = masterCellFaceMap.toc();
 
-    forAll (masterCellFaces, faceI)
+    forAll(masterCellFaces, faceI)
     {
         // Attempt to renumber the face using the masterLayerPointMap.
         // Missing point remain the same
@@ -406,7 +406,7 @@ void Foam::attachDetach::detachInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterLayerPointMap.found(oldFace[pointI]))
             {
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index 868d8b694d..70f3e29cb0 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -60,7 +60,7 @@ Foam::tmp<Foam::vectorField> Foam::layerAdditionRemoval::extrusionDir() const
         // Detected a valid layer.  Grab the point and face collapse mapping
         const labelList& ptc = pointsPairing();
 
-        forAll (extrusionDir, mpI)
+        forAll(extrusionDir, mpI)
         {
             extrusionDir[mpI] = points[ptc[mpI]] - points[mp[mpI]];
         }
@@ -125,7 +125,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Add the new points
     labelList addedPoints(mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         // Add the point nominal thickness away from the master zone point
         // and grab the label
@@ -159,7 +159,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     labelList addedCells(mf.size());
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         addedCells[faceI] =
             ref.setAction
@@ -187,13 +187,13 @@ void Foam::layerAdditionRemoval::addCellLayer
     // owner: if the master cell is equal to the face owner the flux
     // remains the same; otherwise it is flipped
 
-    forAll (zoneFaces, faceI)
+    forAll(zoneFaces, faceI)
     {
         const face oldFace = zoneFaces[faceI].reverseFace();
 
         face newFace(oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             newFace[pointI] = addedPoints[oldFace[pointI]];
         }
@@ -235,7 +235,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     const faceList& faces = mesh.faces();
 // Pout << "mfFlip: " << mfFlip << endl;
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         const label curfaceID = mf[faceI];
 
@@ -381,7 +381,7 @@ void Foam::layerAdditionRemoval::addCellLayer
         label patchID = -1;
         label zoneID = -1;
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             const label cf = curFaces[faceI];
 
@@ -447,11 +447,11 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const labelList& curFaces = cells[mc[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the master zone; if not add it
             if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -464,7 +464,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         masterLayerPointMap.insert
         (
@@ -476,7 +476,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Grab the list of faces of the master layer
     const labelList masterCellFaces = masterCellFaceMap.toc();
 
-    forAll (masterCellFaces, faceI)
+    forAll(masterCellFaces, faceI)
     {
         // Attempt to renumber the face using the masterLayerPointMap.
         // Missing point remain the same
@@ -489,7 +489,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterLayerPointMap.found(oldFace[pointI]))
             {
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 6f2041ddfb..ea79578a50 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -207,7 +207,7 @@ bool Foam::layerAdditionRemoval::changeTopology() const
     scalar minDelta = GREAT;
     scalar maxDelta = 0;
 
-    forAll (fz, faceI)
+    forAll(fz, faceI)
     {
         scalar curDelta = V[mc[faceI]]/mag(S[fz[faceI]]);
         avgDelta += curDelta;
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index 90180af091..d8645b18a8 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -57,7 +57,7 @@ bool Foam::layerAdditionRemoval::validCollapse() const
 
     label nBoundaryHits = 0;
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         if
         (
@@ -114,7 +114,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& mc =
         topoChanger().mesh().faceZones()[faceZoneID_.index()].masterCells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         ref.setAction(polyRemoveCell(mc[cellI]));
     }
@@ -125,11 +125,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const cell& curCell = cells[mc[cellI]];
 
-        forAll (curCell, faceI)
+        forAll(curCell, faceI)
         {
             // Check if the face is in the master zone.  If not, remove it
             if
@@ -149,7 +149,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     }
 
     // Remove all points that will be collapsed
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         ref.setAction(polyRemovePoint(ptc[pointI]));
     }
@@ -166,7 +166,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& meshPoints =
         mesh.faceZones()[faceZoneID_.index()]().meshPoints();
 
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         removedPointMap.insert(ptc[pointI], meshPoints[pointI]);
     }
@@ -180,11 +180,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
     // Make a list of faces to be modified using the map to avoid duplicates
     labelHashSet facesToModify(ptc.size()*primitiveMesh::facesPerPoint_);
 
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         const labelList& curFaces = pf[ptc[pointI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!facesToRemoveMap.found(curFaces[faceI]))
             {
@@ -197,7 +197,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
 //Pout << "faces to modify: " << ftm << endl;
 
-    forAll (ftm, faceI)
+    forAll(ftm, faceI)
     {
         // For every face to modify, copy the face and re-map the vertices.
         // It is known all the faces will be changed since they hang off
@@ -206,7 +206,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
         face newFace(faces[curFaceID]);
 
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::iterator rpmIter =
                 removedPointMap.find(newFace[pointI]);
@@ -269,7 +269,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& mf = mesh.faceZones()[faceZoneID_.index()];
     const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         // Grab the owner and neighbour of the faces to be collapsed and get rid
         // of the cell to be removed
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index e42896cf61..766196f00e 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -95,7 +95,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
     label nPointErrors = 0;
     label nFaceErrors = 0;
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         // Get the local master face
         face curLocalFace = mlf[faceI];
@@ -128,7 +128,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         ftc[faceI] = lidFace.oppositeIndex();
 
         // Using the local face insert the points into the lid list
-        forAll (curLocalFace, pointI)
+        forAll(curLocalFace, pointI)
         {
             const label clp = curLocalFace[pointI];
 
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
index 5993d96e3d..e56d7a9c90 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
@@ -68,12 +68,7 @@ void Foam::edgeVertex::updateLabels
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        Map<label>::const_iterator iter = cellPairs.begin();
-        iter != cellPairs.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, cellPairs, iter)
     {
         label newMaster = map[iter.key()];
 
@@ -97,12 +92,7 @@ void Foam::edgeVertex::updateLabels
     {
         Map<label> newCellPairs(2*cellPairs.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = cellPairs.begin();
-            iter != cellPairs.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, cellPairs, iter)
         {
             label newMaster = map[iter.key()];
 
@@ -144,14 +134,9 @@ void Foam::edgeVertex::updateLabels
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        labelHashSet::const_iterator iter = cells.begin();
-        iter != cells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cells, iter)
     {
-        label newCellI = map[iter.key()];
+        const label newCellI = map[iter.key()];
 
         if (newCellI != iter.key())
         {
@@ -166,14 +151,9 @@ void Foam::edgeVertex::updateLabels
     {
         labelHashSet newCells(2*cells.size());
 
-        for
-        (
-            labelHashSet::const_iterator iter = cells.begin();
-            iter != cells.end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, cells, iter)
         {
-            label newCellI = map[iter.key()];
+            const label newCellI = map[iter.key()];
 
             if (newCellI != -1)
             {
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index a33ac69f57..fc344448a7 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -887,12 +887,7 @@ void Foam::meshCutAndRemove::setRefinement
 
     const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
 
-    for
-    (
-        Map<edge>::const_iterator iter = faceSplitCuts.begin();
-        iter != faceSplitCuts.end();
-        ++iter
-    )
+    forAllConstIter(Map<edge>, faceSplitCuts, iter)
     {
         label faceI = iter.key();
 
@@ -1310,15 +1305,9 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
     {
         Map<label> newAddedFaces(addedFaces_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedFaces_.begin();
-            iter != addedFaces_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedFaces_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = map.reverseCellMap()[cellI];
 
             label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index f7e97a488f..00d0afd67b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -737,12 +737,7 @@ void Foam::meshCutter::setRefinement
 
     const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
 
-    for
-    (
-        Map<edge>::const_iterator iter = faceSplitCuts.begin();
-        iter != faceSplitCuts.end();
-        ++iter
-    )
+    forAllConstIter(Map<edge>, faceSplitCuts, iter)
     {
         label faceI = iter.key();
 
@@ -1015,15 +1010,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
         // key.
         Map<label> newAddedCells(addedCells_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedCells_.begin();
-            iter != addedCells_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedCells_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = morphMap.reverseCellMap()[cellI];
 
             label addedCellI = iter();
@@ -1054,15 +1043,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
     {
         Map<label> newAddedFaces(addedFaces_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedFaces_.begin();
-            iter != addedFaces_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedFaces_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = morphMap.reverseCellMap()[cellI];
 
             label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 5e14328974..bcad8bef91 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -40,10 +40,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(multiDirRefinement, 0);
-}
+defineTypeNameAndDebug(Foam::multiDirRefinement, 0);
 
 
 // * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * //
@@ -93,12 +90,7 @@ void Foam::multiDirRefinement::update
 {
     field.setSize(field.size() + splitMap.size());
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         field[iter()] = field[iter.key()];
     }
@@ -116,12 +108,7 @@ void Foam::multiDirRefinement::addCells
 
     labels.setSize(labels.size() + splitMap.size());
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         labels[newCellI++] = iter();
     }
@@ -165,12 +152,7 @@ void Foam::multiDirRefinement::addCells
     }
 
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         label masterI = iter.key();
         label newCellI = iter();
@@ -307,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
         // Increment count
         forAll(consistentCells, i)
         {
-            label cellI = consistentCells[i];
+            const label cellI = consistentCells[i];
 
             Map<label>::iterator iter = hexCellSet.find(cellI);
 
@@ -380,7 +362,7 @@ void Foam::multiDirRefinement::refineHex8
 
     forAll(cellMap, cellI)
     {
-        label oldCellI = cellMap[cellI];
+        const label oldCellI = cellMap[cellI];
 
         if (addedCells_[oldCellI].size())
         {
@@ -439,7 +421,7 @@ void Foam::multiDirRefinement::refineAllDirs
             // Non uniform directions.
             forAll(refCells, refI)
             {
-                label cellI = cellLabels_[refI];
+                const label cellI = cellLabels_[refI];
 
                 refCells[refI] = refineCell(cellI, dirField[cellI]);
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index de9dd525d1..422a98d57a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -36,12 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(refinementIterator, 0);
-
-}
+defineTypeNameAndDebug(Foam::refinementIterator, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -212,12 +207,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
         // from meshRefiner.updateMesh call) and add to global list of added
         const Map<label>& addedNow = meshRefiner_.addedCells();
 
-        for
-        (
-            Map<label>::const_iterator iter = addedNow.begin();
-            iter != addedNow.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedNow, iter)
         {
             if (!addedCells.insert(iter.key(), iter()))
             {
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 9f27564cf4..ef2ece26b1 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -36,10 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-defineTypeNameAndDebug(undoableMeshCutter, 0);
-}
+defineTypeNameAndDebug(Foam::undoableMeshCutter, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -67,12 +65,7 @@ void Foam::undoableMeshCutter::printCellRefTree
 // For debugging
 void Foam::undoableMeshCutter::printRefTree(Ostream& os) const
 {
-    for
-    (
-        Map<splitCell*>::const_iterator iter = liveSplitCells_.begin();
-        iter != liveSplitCells_.end();
-        ++iter
-    )
+    forAllConstIter(Map<splitCell*>, liveSplitCells_, iter)
     {
         const splitCell* splitPtr = iter();
 
@@ -113,7 +106,7 @@ void Foam::undoableMeshCutter::updateLabels
 
     bool changed = false;
 
-    forAllConstIter(Map<splitCell*>,liveSplitCells, iter)
+    forAllConstIter(Map<splitCell*>, liveSplitCells, iter)
     {
         const splitCell* splitPtr = iter();
 
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 301091ca8a..27370c56ce 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -299,15 +299,9 @@ void Foam::perfectInterface::setRefinement
 
 
     // 2. Renumber (non patch0/1) faces.
-    for
-    (
-        labelHashSet::const_iterator iter = affectedFaces.begin();
-        iter != affectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, affectedFaces, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const face& f = mesh.faces()[faceI];
 
         face newFace(f.size());
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 65bca6a2f0..4eae7a7c69 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -930,7 +930,7 @@ void Foam::polyMeshAdder::mergePointZones
 
     from1ToAll.setSize(pz1.size());
 
-    forAll (pz1, zoneI)
+    forAll(pz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(pz1[zoneI].name(), zoneNames);
     }
@@ -996,7 +996,7 @@ void Foam::polyMeshAdder::mergeFaceZones
 
     from1ToAll.setSize(fz1.size());
 
-    forAll (fz1, zoneI)
+    forAll(fz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(fz1[zoneI].name(), zoneNames);
     }
@@ -1096,7 +1096,7 @@ void Foam::polyMeshAdder::mergeCellZones
     append(cz0.names(), zoneNames);
 
     from1ToAll.setSize(cz1.size());
-    forAll (cz1, zoneI)
+    forAll(cz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(cz1[zoneI].name(), zoneNames);
     }
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index 460059c288..f9da5b125f 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -82,7 +82,7 @@ void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
         List<polyPatch*> newPatches(oldPatches.size());
         label nNewPatches = 0;
 
-        forAll (oldPatches, patchI)
+        forAll(oldPatches, patchI)
         {
             if (oldPatches[patchI].size())
             {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 22b12be984..c180f59b76 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -462,12 +462,7 @@ void Foam::faceCollapser::setRefinement
         }
     }
 
-    for
-    (
-        Map<labelList>::const_iterator iter = splitEdges.begin();
-        iter != splitEdges.end();
-        ++iter
-    )
+    forAllConstIter(Map<labelList>, splitEdges, iter)
     {
         Pout<< "Split edge:" << iter.key()
             << " verts:" << mesh_.edges()[iter.key()]
@@ -500,12 +495,7 @@ void Foam::faceCollapser::setRefinement
     // Modify faces affected (but not removed)
     //
 
-    for
-    (
-        labelHashSet::const_iterator iter = affectedFaces.begin();
-        iter != affectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, affectedFaces, iter)
     {
         filterFace(splitEdges, iter.key(), meshMod);
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index f2db1f59f5..1c1b32cced 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -534,7 +534,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
 
 
     // loop over the cells
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         // find the first non-removed cell that has not been visited yet
         if (!cellRemoved(cellI) && visited[cellI] == 0)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 18885d22c9..1f7de13aba 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -130,7 +130,7 @@ Foam::wordList Foam::polyTopoChanger::types() const
 
     wordList t(modifiers.size());
 
-    forAll (modifiers, modifierI)
+    forAll(modifiers, modifierI)
     {
         t[modifierI] = modifiers[modifierI].type();
     }
@@ -146,7 +146,7 @@ Foam::wordList Foam::polyTopoChanger::names() const
 
     wordList t(modifiers.size());
 
-    forAll (modifiers, modifierI)
+    forAll(modifiers, modifierI)
     {
         t[modifierI] = modifiers[modifierI].name();
     }
@@ -163,7 +163,7 @@ bool Foam::polyTopoChanger::changeTopology() const
 
     bool triggerChange = false;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -211,7 +211,7 @@ Foam::polyTopoChanger::topoChangeRequest() const
     polyTopoChange* refPtr(new polyTopoChange(mesh()));
     polyTopoChange& ref = *refPtr;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -228,7 +228,7 @@ void Foam::polyTopoChanger::modifyMotionPoints(pointField& p) const
 {
     const PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -244,7 +244,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m)
     // Go through all mesh modifiers and accumulate the morphing information
     PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         topoChanges[morphI].updateMesh(m);
     }
@@ -298,7 +298,7 @@ void Foam::polyTopoChanger::addTopologyModifiers
     setSize(tm.size());
 
     // Copy the patch pointers
-    forAll (tm, tmI)
+    forAll(tm, tmI)
     {
         if (tm[tmI]->topoChanger() != *this)
         {
@@ -323,7 +323,7 @@ Foam::label Foam::polyTopoChanger::findModifierID
 {
     const PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].name() == modName)
         {
diff --git a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
index c2e7b5ce72..9bfbc6f509 100644
--- a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
+++ b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
@@ -82,12 +82,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
 
     IOobjectList fileSets(Objects.lookupClass(Type::typeName));
 
-    for
-    (
-        IOobjectList::const_iterator iter = fileSets.begin();
-        iter != fileSets.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, fileSets, iter)
     {
         if (!memSets.found(iter.key()))
         {
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 7c4ab7553d..410bb1d710 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -157,7 +157,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     Map<label>& pointMergeMap = cutPatch.pointMergeMap();
 
     // Create mapping for every merged point of the slave patch
-    forAll (slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointI)
     {
         if (slavePointPointHits[pointI] >= 0)
         {
@@ -175,7 +175,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<labelHashSet> usedMasterEdges(slaveEdges.size());
 
     // Collect of slave point hits
-    forAll (slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointI)
     {
         // For point hits, add all point-edges from master side to all point
         const labelList& curSlaveEdges = slavePointEdges[pointI];
@@ -187,11 +187,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
             // Mark all current master edges as used for all the current slave
             // edges
-            forAll (curSlaveEdges, slaveEdgeI)
+            forAll(curSlaveEdges, slaveEdgeI)
             {
                 labelHashSet& sm = usedMasterEdges[curSlaveEdges[slaveEdgeI]];
 
-                forAll (curMasterEdges, masterEdgeI)
+                forAll(curMasterEdges, masterEdgeI)
                 {
                     sm.insert(curMasterEdges[masterEdgeI]);
                 }
@@ -200,7 +200,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         else if (slavePointEdgeHits[pointI] > -1)
         {
             // For edge hits, add the master edge
-            forAll (curSlaveEdges, slaveEdgeI)
+            forAll(curSlaveEdges, slaveEdgeI)
             {
                 usedMasterEdges[curSlaveEdges[slaveEdgeI]].insert
                 (
@@ -213,7 +213,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     // Collect off master point hits
     // For every master point that has hit an edge, add all edges coming from
     // that point to the slave edge that has been hit
-    forAll (masterPointEdgeHits, masterPointI)
+    forAll(masterPointEdgeHits, masterPointI)
     {
         if (masterPointEdgeHits[masterPointI] > -1)
         {
@@ -222,7 +222,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             labelHashSet& sm =
                 usedMasterEdges[masterPointEdgeHits[masterPointI]];
 
-            forAll (curMasterEdges, masterEdgeI)
+            forAll(curMasterEdges, masterEdgeI)
             {
                 sm.insert(curMasterEdges[masterEdgeI]);
             }
@@ -230,7 +230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
 //     Pout << "used edges: " << endl;
-//     forAll (usedMasterEdges, edgeI)
+//     forAll(usedMasterEdges, edgeI)
 //     {
 //         Pout << "edge: " << edgeI << " used: " << usedMasterEdges[edgeI].toc() << endl;
 //     }
@@ -241,7 +241,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<DynamicList<label> > pointsIntoSlaveEdges(slaveEdges.size());
 
     // Add all points from the slave patch that have hit the edge
-    forAll (slavePointEdgeHits, pointI)
+    forAll(slavePointEdgeHits, pointI)
     {
         if (slavePointEdgeHits[pointI] > -1)
         {
@@ -294,7 +294,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
     // Add all points from the slave patch that have hit a face
-    forAll (slavePointFaceHits, pointI)
+    forAll(slavePointFaceHits, pointI)
     {
         if
         (
@@ -333,7 +333,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         }
     }
 
-    forAll (masterPointEdgeHits, pointI)
+    forAll(masterPointEdgeHits, pointI)
     {
         if (masterPointEdgeHits[pointI] > -1)
         {
@@ -402,7 +402,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -443,11 +443,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 const labelList cf = addedFaces.toc();
                 addedFaces.clear();
 
-                forAll (cf, cfI)
+                forAll(cf, cfI)
                 {
                     const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                    forAll (curNbrs, nbrI)
+                    forAll(curNbrs, nbrI)
                     {
                         if (!curFaceMap.found(curNbrs[nbrI]))
                         {
@@ -493,11 +493,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     const labelList cf = addedFaces.toc();
                     addedFaces.clear();
 
-                    forAll (cf, cfI)
+                    forAll(cf, cfI)
                     {
                         const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                        forAll (curNbrs, nbrI)
+                        forAll(curNbrs, nbrI)
                         {
                             if (!curFaceMap.found(curNbrs[nbrI]))
                             {
@@ -541,7 +541,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
             const labelList curFaces = curFaceMap.toc();
 //             Pout << "curFaces: " << curFaces << endl;
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
 //                 Pout<< "face: " << curFaces[faceI] << " "
 //                     << masterPatch[curFaces[faceI]]
@@ -550,7 +550,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //                     << endl;
                 const labelList& me = masterFaceEdges[curFaces[faceI]];
 
-                forAll (me, meI)
+                forAll(me, meI)
                 {
                     curMasterEdgesMap.insert(me[meI]);
                 }
@@ -588,7 +588,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             linePointRef curSlaveLine = curEdge.line(projectedSlavePoints);
             const scalar curSlaveLineMag = curSlaveLine.mag();
 //             Pout << "curSlaveLine: " << curSlaveLine << endl;
-            forAll (curMasterEdges, masterEdgeI)
+            forAll(curMasterEdges, masterEdgeI)
             {
                 if (!curUme.found(curMasterEdges[masterEdgeI]))
                 {
@@ -746,14 +746,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     // Re-pack the points into edges lists
     labelListList pime(pointsIntoMasterEdges.size());
 
-    forAll (pointsIntoMasterEdges, i)
+    forAll(pointsIntoMasterEdges, i)
     {
         pime[i].transfer(pointsIntoMasterEdges[i]);
     }
 
     labelListList pise(pointsIntoSlaveEdges.size());
 
-    forAll (pointsIntoSlaveEdges, i)
+    forAll(pointsIntoSlaveEdges, i)
     {
         pise[i].transfer(pointsIntoSlaveEdges[i]);
     }
@@ -788,7 +788,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     boolList orphanedMaster(masterPatch.size(), false);
     boolList orphanedSlave(slavePatch.size(), false);
 
-    forAll (cutFaces, faceI)
+    forAll(cutFaces, faceI)
     {
         const face& curCutFace = cutFaces[faceI];
         const label curMaster = cutFaceMaster[faceI];
@@ -889,7 +889,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             // Renumber the slave face into merged labels
             face rsf(slavePatch[curSlave]);
 
-            forAll (rsf, i)
+            forAll(rsf, i)
             {
                 Map<label>::const_iterator mpIter = pointMergeMap.find(rsf[i]);
 
@@ -1107,7 +1107,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nOrphanedMasters = 0;
 
-    forAll (orphanedMaster, faceI)
+    forAll(orphanedMaster, faceI)
     {
         if (orphanedMaster[faceI])
         {
@@ -1138,7 +1138,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nOrphanedSlaves = 0;
 
-    forAll (orphanedSlave, faceI)
+    forAll(orphanedSlave, faceI)
     {
         if (orphanedSlave[faceI])
         {
@@ -1197,7 +1197,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //     Pout << "masterStickOuts: " << masterStickOuts << endl;
 
     // Re-create the master stick-out faces
-    forAll (masterStickOuts, faceI)
+    forAll(masterStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -1211,7 +1211,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll (oldRichFace, pointI)
+        forAll(oldRichFace, pointI)
         {
             if (ref.pointRemoved(oldRichFace[pointI]))
             {
@@ -1230,7 +1230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //         Pout << "old rich master face: " << oldRichFace << " old face: " << oldFace << endl;
         DynamicList<label> newFaceLabels(2*oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterMeshPointMap.found(oldFace[pointI]))
             {
@@ -1273,7 +1273,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     // Find the points on the edge between them
                     const label localNextLabel = mmpmIter();
 
-                    forAll (curEdges, curEdgeI)
+                    forAll(curEdges, curEdgeI)
                     {
                         if
                         (
@@ -1306,7 +1306,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
                                 scalarField edgePointWeights(curPime.size());
 
-                                forAll (curPime, curPimeI)
+                                forAll(curPime, curPimeI)
                                 {
                                     edgePointWeights[curPimeI] =
                                         (
@@ -1354,7 +1354,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                     label nextPoint = -1;
                                     scalar dist = 2;
 
-                                    forAll (edgePointWeights, wI)
+                                    forAll(edgePointWeights, wI)
                                     {
                                         if (edgePointWeights[wI] < dist)
                                         {
@@ -1468,7 +1468,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     // Re-create the slave stick-out faces
 
-    forAll (slaveStickOuts, faceI)
+    forAll(slaveStickOuts, faceI)
     {
         // Renumber the face and remove additional points
         const label curFaceID = slaveStickOuts[faceI];
@@ -1481,7 +1481,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll (oldRichFace, pointI)
+        forAll(oldRichFace, pointI)
         {
             if
             (
@@ -1517,7 +1517,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         DynamicList<label> newFaceLabels(2*oldFace.size());
 
 //         Pout << "old rich slave face: " << oldRichFace << " old face: " << oldFace << endl;
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Try to find the point in retired points
             label curP = oldFace[pointI];
@@ -1580,7 +1580,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     // Find the points on the edge between them
                     const label localNextLabel = mmpmIter();
 
-                    forAll (curEdges, curEdgeI)
+                    forAll(curEdges, curEdgeI)
                     {
                         if
                         (
@@ -1613,7 +1613,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
                                 scalarField edgePointWeights(curPise.size());
 
-                                forAll (curPise, curPiseI)
+                                forAll(curPise, curPiseI)
                                 {
                                     edgePointWeights[curPiseI] =
                                     (
@@ -1661,7 +1661,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                     label nextPoint = -1;
                                     scalar dist = 2;
 
-                                    forAll (edgePointWeights, wI)
+                                    forAll(edgePointWeights, wI)
                                     {
                                         if (edgePointWeights[wI] < dist)
                                         {
@@ -1782,7 +1782,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nRetiredPoints = 0;
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         if (pointMergeMap.found(slaveMeshPoints[pointI]))
         {
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index 1684a7c20d..5271b4cdb3 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -82,7 +82,7 @@ void Foam::slidingInterface::decoupleInterface
 
     // Recover faces in master patch
 
-    forAll (masterPatchAddr, faceI)
+    forAll(masterPatchAddr, faceI)
     {
         // Make a copy of the face and turn it if necessary
         face newFace = faces[masterPatchAddr[faceI]];
@@ -128,7 +128,7 @@ void Foam::slidingInterface::decoupleInterface
 
     // Recover faces in slave patch
 
-    forAll (slavePatchAddr, faceI)
+    forAll(slavePatchAddr, faceI)
     {
         // Make a copy of face and turn it if necessary
         face newFace = faces[slavePatchAddr[faceI]];
@@ -139,7 +139,7 @@ void Foam::slidingInterface::decoupleInterface
         }
 
         // Recover retired points on the slave side
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::const_iterator rpmIter = rpm.find(newFace[pointI]);
             if (rpmIter != rpm.end())
@@ -172,7 +172,7 @@ void Foam::slidingInterface::decoupleInterface
     // Grab the list of faces in the layer
     const labelList& masterStickOuts = masterStickOutFaces();
 
-    forAll (masterStickOuts, faceI)
+    forAll(masterStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -184,7 +184,7 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Check if the point is removed
             if (ref.pointRemoved(oldFace[pointI]))
@@ -256,11 +256,11 @@ void Foam::slidingInterface::decoupleInterface
         primitiveMesh::facesPerCell_*(masterPatch.size() + slavePatch.size())
     );
 
-    forAll (slaveFc, faceI)
+    forAll(slaveFc, faceI)
     {
         const labelList& curFaces = cells[slaveFc[faceI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the slave face zone; and
             // if it has been removed; if not add it
@@ -283,7 +283,7 @@ void Foam::slidingInterface::decoupleInterface
     // Grab master point mapping
     const Map<label>& masterPm = masterPatch.meshPointMap();
 
-    forAll (slaveStickOuts, faceI)
+    forAll(slaveStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -295,7 +295,7 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Check if the point is removed or retired
             if (rpm.found(oldFace[pointI]))
@@ -378,7 +378,7 @@ void Foam::slidingInterface::decoupleInterface
     const labelList& slaveMeshPoints =
         mesh.faceZones()[slaveFaceZoneID_.index()]().meshPoints();
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         ref.setAction
         (
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index 2a4f2f9d69..56e70fbd35 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -68,7 +68,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
     Map<label> mpLookup(2*mp.size());
 
-    forAll (mp, mpI)
+    forAll(mp, mpI)
     {
         mpLookup.insert(mp[mpI], mpI);
     }
@@ -78,7 +78,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
     localFacesPtr_ = new faceList(faces.size());
     faceList& lf = *localFacesPtr_;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         const face& f = faces[faceI];
 
@@ -86,7 +86,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
         curlf.setSize(f.size());
 
-        forAll (f, pointI)
+        forAll(f, pointI)
         {
             curlf[pointI] = mpLookup.find(f[pointI])();
         }
@@ -108,7 +108,7 @@ void Foam::enrichedPatch::calcLocalPoints() const
     localPointsPtr_ = new pointField(mp.size());
     pointField& lp = *localPointsPtr_;
 
-    forAll (lp, i)
+    forAll(lp, i)
     {
         lp[i] = pointMap().find(mp[i])();
     }
@@ -225,11 +225,11 @@ bool Foam::enrichedPatch::checkSupport() const
 
     bool error = false;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         const face& curFace = faces[faceI];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             if (!pointMap().found(curFace[pointI]))
             {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 5582f44e82..caee3a88c8 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -99,7 +99,7 @@ void Foam::enrichedPatch::calcCutFaces() const
         (pp.size()*primitiveMesh::edgesPerPoint_);
 
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         const face& curLocalFace = lf[faceI];
         const face& curGlobalFace = enFaces[faceI];
@@ -119,7 +119,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 //         }
 //         {
 //             pointField facePoints = curLocalFace.points(lp);
-//             forAll (curLocalFace, pointI)
+//             forAll(curLocalFace, pointI)
 //             {
 //                 Pout << "v " << facePoints[pointI].x() << " "
 //                     << facePoints[pointI].y() << " "
@@ -141,7 +141,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
         // Insert the edges of current face into the seed list.
         edgeList cfe = curLocalFace.edges();
-        forAll (curLocalFace, edgeI)
+        forAll(curLocalFace, edgeI)
         {
             edgeSeeds.append(cfe[edgeI]);
         }
@@ -214,7 +214,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                 scalar atanTurn = -GREAT;
                 label bestAtanPoint = -1;
 
-                forAll (nextPoints, nextI)
+                forAll(nextPoints, nextI)
                 {
                     // Exclude the point we are coming from; there will always
                     // be more than one edge, so this is safe
@@ -314,7 +314,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                     // If the edge corresponds to a starting face edge,
                     // mark the starting face edge as true
 
-                    forAll (cutFaceLocal, cutI)
+                    forAll(cutFaceLocal, cutI)
                     {
                         const edge curCutFaceEdge
                         (
@@ -424,9 +424,9 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                                 // For every current face, try to find it in the
                                 // zero-list
-                                forAll (curMasterFaces, i)
+                                forAll(curMasterFaces, i)
                                 {
-                                    forAll (masterFacesOfPZero, j)
+                                    forAll(masterFacesOfPZero, j)
                                     {
                                         if
                                         (
@@ -444,7 +444,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                             // If all point are found attempt matching
                             if (!miss)
                             {
-                                forAll (hits, pointI)
+                                forAll(hits, pointI)
                                 {
                                     if (hits[pointI] == cutFaceGlobal.size())
                                     {
@@ -522,7 +522,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                         faceSizeDebug *= 2;
 
                         // Check for duplicate points in the face
-                        forAll (cutFaceGlobalPoints, checkI)
+                        forAll(cutFaceGlobalPoints, checkI)
                         {
                             for
                             (
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 5197d81022..f92963bb2c 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -84,7 +84,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
     // Add slave faces into the enriched faces list
 
-    forAll (slavePatch_, faceI)
+    forAll(slavePatch_, faceI)
     {
         const face oldFace = slavePatch_[faceI];
         const face oldLocalFace = slaveLocalFaces[faceI];
@@ -95,7 +95,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
         // Note: The number of points and edges in a face is always identical
         // so both can be done is the same loop
-        forAll (oldFace, i)
+        forAll(oldFace, i)
         {
             // Add the point
             Map<label>::const_iterator mpIter =
@@ -166,7 +166,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField slavePosOnEdge(slavePointsOnEdge.size());
 
-                forAll (slavePointsOnEdge, edgePointI)
+                forAll(slavePointsOnEdge, edgePointI)
                 {
                     slavePosOnEdge[edgePointI] =
                         pointMap().find(slavePointsOnEdge[edgePointI])();
@@ -207,7 +207,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     label nextPoint = -1;
                     scalar dist = 2;
 
-                    forAll (edgePointWeights, wI)
+                    forAll(edgePointWeights, wI)
                     {
                         if (edgePointWeights[wI] < dist)
                         {
@@ -239,7 +239,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
     // Add master faces into the enriched faces list
 
-    forAll (masterPatch_, faceI)
+    forAll(masterPatch_, faceI)
     {
         const face& oldFace = masterPatch_[faceI];
         const face& oldLocalFace = masterLocalFaces[faceI];
@@ -250,7 +250,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
         // Note: The number of points and edges in a face is always identical
         // so both can be done is the same loop
-        forAll (oldFace, i)
+        forAll(oldFace, i)
         {
             // Add the point
             Map<label>::const_iterator mpIter =
@@ -317,7 +317,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField masterPosOnEdge(masterPointsOnEdge.size());
 
-                forAll (masterPointsOnEdge, edgePointI)
+                forAll(masterPointsOnEdge, edgePointI)
                 {
                     masterPosOnEdge[edgePointI] =
                         pointMap().find(masterPointsOnEdge[edgePointI])();
@@ -358,7 +358,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     label nextPoint = -1;
                     scalar dist = 2;
 
-                    forAll (edgePointWeights, wI)
+                    forAll(edgePointWeights, wI)
                     {
                         if (edgePointWeights[wI] < dist)
                         {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index 927ad3047d..3a2d6b2aeb 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -56,11 +56,11 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     const faceList& ef = enrichedFaces();
 
     // Add the original face points
-    forAll (masterPatch_, faceI)
+    forAll(masterPatch_, faceI)
     {
         const face& curFace = ef[faceI + slavePatch_.size()];
 //         Pout << "Cur face in pfAddr: " << curFace << endl;
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             Map<DynamicList<label> >::iterator mpfIter =
                 mpf.find(curFace[pointI]);
@@ -87,7 +87,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     // Add the projected points which hit the face
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
 
-    forAll (slavePointFaceHits_, pointI)
+    forAll(slavePointFaceHits_, pointI)
     {
         if
         (
@@ -132,7 +132,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     masterPointFacesPtr_ = new Map<labelList>(2*mpfToc.size());
     Map<labelList>& masterPointFaceAddr = *masterPointFacesPtr_;
 
-    forAll (mpfToc, mpfTocI)
+    forAll(mpfToc, mpfTocI)
     {
         labelList l;
         l.transfer(mpf.find(mpfToc[mpfTocI])());
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
index f4125b96c0..0fb7b20673 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
@@ -47,7 +47,7 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& masterMeshPoints = masterPatch_.meshPoints();
     const pointField& masterLocalPoints = masterPatch_.localPoints();
 
-    forAll (masterMeshPoints, pointI)
+    forAll(masterMeshPoints, pointI)
     {
         if (!pmm.found(masterMeshPoints[pointI]))
         {
@@ -63,7 +63,7 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
     const pointField& slaveLocalPoints = slavePatch_.localPoints();
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         if (!pmm.found(slaveMeshPoints[pointI]))
         {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index 96c89fa810..a24586b754 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -53,11 +53,11 @@ void Foam::enrichedPatch::calcPointPoints() const
 
     register bool found = false;
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         const face& curFace = lf[faceI];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             DynamicList<label, primitiveMesh::edgesPerPoint_>&
                 curPp = pp[curFace[pointI]];
@@ -67,7 +67,7 @@ void Foam::enrichedPatch::calcPointPoints() const
 
             found = false;
 
-            forAll (curPp, i)
+            forAll(curPp, i)
             {
                 if (curPp[i] == next)
                 {
@@ -85,7 +85,7 @@ void Foam::enrichedPatch::calcPointPoints() const
             label prev = curFace.prevLabel(pointI);
             found = false;
 
-            forAll (curPp, i)
+            forAll(curPp, i)
             {
                 if (curPp[i] == prev)
                 {
@@ -105,7 +105,7 @@ void Foam::enrichedPatch::calcPointPoints() const
     pointPointsPtr_ = new labelListList(pp.size());
     labelListList& ppAddr = *pointPointsPtr_;
 
-    forAll (pp, pointI)
+    forAll(pp, pointI)
     {
         ppAddr[pointI].transfer(pp[pointI]);
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 4720d04344..0382b5a5c6 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -465,7 +465,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
         const pointField& slaveLocalPoints = slavePatch.localPoints();
         const vectorField& slavePointNormals = slavePatch.pointNormals();
 
-        forAll (cutPoints, pointI)
+        forAll(cutPoints, pointI)
         {
             // Try to find the cut point in retired points
             Map<label>::const_iterator rpmIter = rpm.find(cutPoints[pointI]);
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index 2831aa8453..e43b23c984 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -64,7 +64,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         masterFaceCellsPtr_ = new labelList(masterPatchFaces.size());
         labelList& mfc = *masterFaceCellsPtr_;
 
-        forAll (masterPatchFaces, faceI)
+        forAll(masterPatchFaces, faceI)
         {
             if (masterFlip[faceI])
             {
@@ -90,7 +90,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         slaveFaceCellsPtr_ = new labelList(slavePatchFaces.size());
         labelList& sfc = *slaveFaceCellsPtr_;
 
-        forAll (slavePatchFaces, faceI)
+        forAll(slavePatchFaces, faceI)
         {
             if (slaveFlip[faceI])
             {
@@ -107,7 +107,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         {
             if (debug)
             {
-                forAll (mfc, faceI)
+                forAll(mfc, faceI)
                 {
                     if (mfc[faceI] < 0)
                     {
@@ -119,7 +119,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
                     }
                 }
 
-                forAll (sfc, faceI)
+                forAll(sfc, faceI)
                 {
                     if (sfc[faceI] < 0)
                     {
@@ -152,11 +152,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& masterMeshPoints = masterPatch.meshPoints();
 
-        forAll (masterMeshPoints, pointI)
+        forAll(masterMeshPoints, pointI)
         {
             const labelList& curFaces = pointFaces[masterMeshPoints[pointI]];
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 // Check if the face belongs to the master face zone;
                 // if not add it
@@ -181,11 +181,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& slaveMeshPoints = slavePatch.meshPoints();
 
-        forAll (slaveMeshPoints, pointI)
+        forAll(slaveMeshPoints, pointI)
         {
             const labelList& curFaces = pointFaces[slaveMeshPoints[pointI]];
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 // Check if the face belongs to the slave face zone;
                 // if not add it
@@ -272,7 +272,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& mfzRenumber =
         m.faceZoneFaceMap()[masterFaceZoneID_.index()];
 
-    forAll (mfc, faceI)
+    forAll(mfc, faceI)
     {
         label newCellI = reverseCellMap[mfc[mfzRenumber[faceI]]];
 
@@ -289,7 +289,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfzRenumber =
         m.faceZoneFaceMap()[slaveFaceZoneID_.index()];
 
-    forAll (sfc, faceI)
+    forAll(sfc, faceI)
     {
         label newCellI = reverseCellMap[sfc[sfzRenumber[faceI]]];
 
@@ -325,7 +325,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     labelList* newMsofPtr = new labelList(msof.size(), -1);
     labelList& newMsof = *newMsofPtr;
 
-    forAll (msof, faceI)
+    forAll(msof, faceI)
     {
         label newFaceI = reverseFaceMap[msof[faceI]];
 
@@ -341,7 +341,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     labelList* newSsofPtr = new labelList(ssof.size(), -1);
     labelList& newSsof = *newSsofPtr;
 
-    forAll (ssof, faceI)
+    forAll(ssof, faceI)
     {
         label newFaceI = reverseFaceMap[ssof[faceI]];
 
@@ -380,7 +380,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
 
     label key, value;
 
-    forAll (rpmToc, rpmTocI)
+    forAll(rpmToc, rpmTocI)
     {
         key = reversePointMap[rpmToc[rpmTocI]];
 
@@ -413,7 +413,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
 
     const labelList cpepmToc = cpepm.toc();
 
-    forAll (cpepmToc, cpepmTocI)
+    forAll(cpepmToc, cpepmTocI)
     {
         key = reversePointMap[cpepmToc[cpepmTocI]];
 
@@ -466,7 +466,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfzPointRenumber =
         m.faceZonePointMap()[slaveFaceZoneID_.index()];
 
-    forAll (newProjectedSlavePoints, pointI)
+    forAll(newProjectedSlavePoints, pointI)
     {
         if (sfzPointRenumber[pointI] > -1)
         {
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
index 743d36613d..b89bfbe0e7 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
@@ -51,7 +51,7 @@ void Foam::slidingInterface::clearCouple
     const labelList& cutPointZoneLabels =
         mesh.pointZones()[cutPointZoneID_.index()];
 
-    forAll (cutPointZoneLabels, pointI)
+    forAll(cutPointZoneLabels, pointI)
     {
         ref.setAction(polyRemovePoint(cutPointZoneLabels[pointI]));
     }
@@ -60,7 +60,7 @@ void Foam::slidingInterface::clearCouple
     const labelList& cutFaceZoneLabels =
         mesh.faceZones()[cutFaceZoneID_.index()];
 
-    forAll (cutFaceZoneLabels, faceI)
+    forAll(cutFaceZoneLabels, faceI)
     {
         ref.setAction(polyRemoveFace(cutFaceZoneLabels[faceI]));
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index d4c37ebbbe..74ab080d2a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -125,7 +125,7 @@ bool Foam::slidingInterface::projectPoints() const
     scalarField minMasterPointLength(masterLocalPoints.size(), GREAT);
     scalarField minMasterFaceLength(masterPatch.size(), GREAT);
 
-    forAll (masterEdges, edgeI)
+    forAll(masterEdges, edgeI)
     {
         const edge& curEdge = masterEdges[edgeI];
 
@@ -150,7 +150,7 @@ bool Foam::slidingInterface::projectPoints() const
         // Do faces
         const labelList& curFaces = masterEdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             minMasterFaceLength[curFaces[faceI]] =
                 min
@@ -168,7 +168,7 @@ bool Foam::slidingInterface::projectPoints() const
     scalarField minSlavePointLength(slaveLocalPoints.size(), GREAT);
     scalarField minSlaveFaceLength(slavePatch.size(), GREAT);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -193,7 +193,7 @@ bool Foam::slidingInterface::projectPoints() const
         // Do faces
         const labelList& curFaces = slaveEdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             minSlaveFaceLength[curFaces[faceI]] =
                 min
@@ -232,7 +232,7 @@ bool Foam::slidingInterface::projectPoints() const
     {
         label nHits = 0;
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -267,7 +267,7 @@ bool Foam::slidingInterface::projectPoints() const
                 << "Adjusting point projection for integral match: ";
         }
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -343,7 +343,7 @@ bool Foam::slidingInterface::projectPoints() const
     }
     else if (matchType_ == PARTIAL)
     {
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -385,7 +385,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar el = 0;
         label nShortEdges = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -440,7 +440,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMergedPoints = 0;
 
-    forAll (projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointI)
     {
         if (slavePointFaceHits[pointI].hit())
         {
@@ -455,7 +455,7 @@ bool Foam::slidingInterface::projectPoints() const
             scalar mergeDist = GREAT;
 
             // Try all point before deciding on best fit.
-            forAll (hitFace, hitPointI)
+            forAll(hitFace, hitPointI)
             {
                 scalar dist =
                     mag(masterLocalPoints[hitFace[hitPointI]] - curPoint);
@@ -505,7 +505,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar minEdgeLength = GREAT;
         scalar el = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -540,7 +540,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMovedPoints = 0;
 
-    forAll (projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointI)
     {
         // Eliminate the points merged into points
         if (slavePointPointHits[pointI] < 0)
@@ -564,7 +564,7 @@ bool Foam::slidingInterface::projectPoints() const
 
             scalar minDistance = GREAT;
 
-            forAll (hitFaceEdges, edgeI)
+            forAll(hitFaceEdges, edgeI)
             {
                 const edge& curEdge = masterEdges[hitFaceEdges[edgeI]];
 
@@ -613,7 +613,7 @@ bool Foam::slidingInterface::projectPoints() const
                 label mergePoint = -1;
                 scalar mergeDist = GREAT;
 
-                forAll (hitMasterEdge, hmeI)
+                forAll(hitMasterEdge, hmeI)
                 {
                     scalar hmeDist =
                         mag(masterLocalPoints[hitMasterEdge[hmeI]] - curPoint);
@@ -670,7 +670,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar minEdgeLength = GREAT;
         scalar el = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -758,7 +758,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -801,11 +801,11 @@ bool Foam::slidingInterface::projectPoints() const
                 const labelList cf = addedFaces.toc();
                 addedFaces.clear();
 
-                forAll (cf, cfI)
+                forAll(cf, cfI)
                 {
                     const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                    forAll (curNbrs, nbrI)
+                    forAll(curNbrs, nbrI)
                     {
                         if (!curFaceMap.found(curNbrs[nbrI]))
                         {
@@ -852,11 +852,11 @@ bool Foam::slidingInterface::projectPoints() const
                     const labelList cf = addedFaces.toc();
                     addedFaces.clear();
 
-                    forAll (cf, cfI)
+                    forAll(cf, cfI)
                     {
                         const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                        forAll (curNbrs, nbrI)
+                        forAll(curNbrs, nbrI)
                         {
                             if (!curFaceMap.found(curNbrs[nbrI]))
                             {
@@ -900,11 +900,11 @@ bool Foam::slidingInterface::projectPoints() const
 
             const labelList curFaces = curFaceMap.toc();
 //             Pout << "curFaces: " << curFaces << endl;
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 const face& f = masterLocalFaces[curFaces[faceI]];
 
-                forAll (f, pointI)
+                forAll(f, pointI)
                 {
                     curPointMap.insert(f[pointI]);
                 }
@@ -956,7 +956,7 @@ bool Foam::slidingInterface::projectPoints() const
 
             edgeNormalInPlane /= mag(edgeNormalInPlane);
 
-            forAll (curMasterPoints, pointI)
+            forAll(curMasterPoints, pointI)
             {
                 const label cmp = curMasterPoints[pointI];
 
@@ -1185,7 +1185,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         const List<objectHit>& oldPointFaceHits = *slavePointFaceHitsPtr_;
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if
             (
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 3f343a1b48..17ce100ed6 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -28,20 +28,18 @@ License
 #include "fvcMeshPhi.H"
 #include "surfaceInterpolate.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(layeredEngineMesh, 0);
+    addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(layeredEngineMesh, 0);
-
-addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-layeredEngineMesh::layeredEngineMesh(const IOobject& io)
+Foam::layeredEngineMesh::layeredEngineMesh(const IOobject& io)
 :
     engineMesh(io),
     pistonLayers_("pistonLayers", dimLength, 0.0)
@@ -55,13 +53,13 @@ layeredEngineMesh::layeredEngineMesh(const IOobject& io)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-layeredEngineMesh::~layeredEngineMesh()
+Foam::layeredEngineMesh::~layeredEngineMesh()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void layeredEngineMesh::move()
+void Foam::layeredEngineMesh::move()
 {
     scalar deltaZ = engineDB_.pistonDisplacement().value();
     Info<< "deltaZ = " << deltaZ << endl;
@@ -71,7 +69,7 @@ void layeredEngineMesh::move()
 
     pointField newPoints = points();
 
-    forAll (newPoints, pointi)
+    forAll(newPoints, pointi)
     {
         point& p = newPoints[pointi];
 
@@ -127,8 +125,4 @@ void layeredEngineMesh::move()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H
index dc72f0819d..4a4199eaeb 100644
--- a/src/engine/engineValve/valveBank.H
+++ b/src/engine/engineValve/valveBank.H
@@ -74,7 +74,7 @@ public:
 
             setSize(valveEntries.size());
 
-            forAll (valveEntries, valveI)
+            forAll(valveEntries, valveI)
             {
                 valveI,
                 set
diff --git a/src/engine/ignition/ignite.H b/src/engine/ignition/ignite.H
index 3e15c36d15..30faf6aaba 100644
--- a/src/engine/ignition/ignite.H
+++ b/src/engine/ignition/ignite.H
@@ -1,4 +1,4 @@
-    forAll (ign.sites(), i)
+    forAll(ign.sites(), i)
     {
         const ignitionSite& ignSite = ign.sites()[i];
 
diff --git a/src/errorEstimation/errorEstimate/errorEstimate.C b/src/errorEstimation/errorEstimate/errorEstimate.C
index b90ef3819d..2a0db1990a 100644
--- a/src/errorEstimation/errorEstimate/errorEstimate.C
+++ b/src/errorEstimation/errorEstimate/errorEstimate.C
@@ -43,7 +43,7 @@ Foam::wordList Foam::errorEstimate<Type>::errorBCTypes() const
         zeroGradientFvPatchField<Type>::typeName
     );
 
-    forAll (psi_.boundaryField(), patchI)
+    forAll(psi_.boundaryField(), patchI)
     {
         if (psi_.boundaryField()[patchI].fixesValue())
         {
diff --git a/src/errorEstimation/errorEstimate/resErrorDiv.C b/src/errorEstimation/errorEstimate/resErrorDiv.C
index 0d1a3f141e..c535a76583 100644
--- a/src/errorEstimation/errorEstimate/resErrorDiv.C
+++ b/src/errorEstimation/errorEstimate/resErrorDiv.C
@@ -66,7 +66,7 @@ div
     > gradVf = fvc::grad(vf);
 
     // Internal faces
-    forAll (owner, faceI)
+    forAll(owner, faceI)
     {
         // Calculate the centre of the face
         const vector& curFaceCentre = faceCentres[faceI];
@@ -96,7 +96,7 @@ div
         aNorm[neighbour[faceI]] -= (1.0 - signF[faceI])*flux[faceI];
     }
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const vectorField& patchFaceCentres =
             faceCentres.boundaryField()[patchI];
@@ -106,7 +106,7 @@ div
 
         const labelList& fCells = patches[patchI].faceCells();
 
-        forAll (fCells, faceI)
+        forAll(fCells, faceI)
         {
             vector d =
                 patchFaceCentres[faceI] - cellCentres[fCells[faceI]];
diff --git a/src/errorEstimation/errorEstimate/resErrorLaplacian.C b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
index 3a2e41711f..821218ee73 100644
--- a/src/errorEstimation/errorEstimate/resErrorLaplacian.C
+++ b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
@@ -140,7 +140,7 @@ laplacian
     > gradVf = fvc::grad(vf);
 
     // Internal faces
-    forAll (owner, faceI)
+    forAll(owner, faceI)
     {
         // Owner
 
@@ -160,7 +160,7 @@ laplacian
 
     }
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const vectorField& patchSf = Sf.boundaryField()[patchI];
         const scalarField& patchMagSf = magSf.boundaryField()[patchI];
@@ -169,7 +169,7 @@ laplacian
 
         const labelList& fCells = patches[patchI].faceCells();
 
-        forAll (fCells, faceI)
+        forAll(fCells, faceI)
         {
             // Subtract diffusion
             res[fCells[faceI]] -=
diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
index 287b0556d6..55a0e3d915 100644
--- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
+++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
@@ -46,7 +46,7 @@ bool Foam::adjustPhi
         scalar fixedMassOut = 0.0;
         scalar adjustableMassOut = 0.0;
 
-        forAll (phi.boundaryField(), patchi)
+        forAll(phi.boundaryField(), patchi)
         {
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             const fvsPatchScalarField& phip = phi.boundaryField()[patchi];
@@ -122,7 +122,7 @@ bool Foam::adjustPhi
                 << exit(FatalError);
         }
 
-        forAll (phi.boundaryField(), patchi)
+        forAll(phi.boundaryField(), patchi)
         {
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             fvsPatchScalarField& phip = phi.boundaryField()[patchi];
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
index fb6de8d568..46a60ca782 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
@@ -57,7 +57,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         Udiag[cells[i]] +=
             V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -80,7 +80,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
         scalar isoDragCoeff = tr(dragCoeff);
@@ -104,7 +104,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         AU[cells[i]] = AU[cells[i]]
           + I*(rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2));
@@ -125,7 +125,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         AU[cells[i]] += mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 40d7e8a40e..71022e571f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -113,7 +113,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (U.boundaryField(), patchi)
+    forAll(U.boundaryField(), patchi)
     {
         if (U.boundaryField()[patchi].fixesValue())
         {
@@ -154,7 +154,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (U.boundaryField(), patchi)
+    forAll(U.boundaryField(), patchi)
     {
         if (U.boundaryField()[patchi].fixesValue())
         {
@@ -199,7 +199,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (rhoU.boundaryField(), patchi)
+    forAll(rhoU.boundaryField(), patchi)
     {
         if (rhoU.boundaryField()[patchi].fixesValue())
         {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index cd1c15a1ac..0eb7683d4e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(extendedLeastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::extendedLeastSquaresVectors, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -160,7 +157,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
     additionalCellsPtr_ = new List<labelPair>(maxNaddCells);
     List<labelPair>& additionalCells_ = *additionalCellsPtr_;
 
-    forAll (detdd, i)
+    forAll(detdd, i)
     {
         label count = 0;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 8fc633292b..4239c522a6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(leastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::leastSquaresVectors, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -248,7 +245,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
         const surfaceVectorField& Sf = mesh.Sf();
         const surfaceScalarField& w = mesh.weights();
 
-        forAll (dd, celli)
+        forAll(dd, celli)
         {
             if (det(dd[celli]) < 3)
             {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index fae03f59f7..fcb479465b 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -203,7 +203,7 @@ Foam::fvMatrix<Type>::fvMatrix
     }
 
     // Initialise coupling coefficients
-    forAll (psi.mesh().boundary(), patchI)
+    forAll(psi.mesh().boundary(), patchI)
     {
         internalCoeffs_.set
         (
@@ -348,7 +348,7 @@ Foam::fvMatrix<Type>::fvMatrix
     }
 
     // Initialise coupling coefficients
-    forAll (psi.mesh().boundary(), patchI)
+    forAll(psi.mesh().boundary(), patchI)
     {
         internalCoeffs_.set
         (
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 67dfdb4425..2fe12f0317 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -527,7 +527,7 @@ void Foam::MULES::limiter
             }
         }
 
-        forAll (sumlPhip, celli)
+        forAll(sumlPhip, celli)
         {
             sumlPhip[celli] =
                 max(min
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index e146c24436..92bb9f42d0 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -27,14 +27,9 @@ License
 #include "fvBoundaryMesh.H"
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
 {
     setSize(basicBdry.size());
 
@@ -50,7 +45,7 @@ void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
 (
     const fvMesh& m
 )
@@ -60,7 +55,7 @@ fvBoundaryMesh::fvBoundaryMesh
 {}
 
 
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
 (
     const fvMesh& m,
     const polyBoundaryMesh& basicBdry
@@ -75,7 +70,7 @@ fvBoundaryMesh::fvBoundaryMesh
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fvBoundaryMesh::movePoints()
+void Foam::fvBoundaryMesh::movePoints()
 {
     forAll(*this, patchi)
     {
@@ -89,11 +84,11 @@ void fvBoundaryMesh::movePoints()
 }
 
 
-lduInterfacePtrsList fvBoundaryMesh::interfaces() const
+Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const
 {
     lduInterfacePtrsList interfaces(size());
 
-    forAll (interfaces, patchi)
+    forAll(interfaces, patchi)
     {
         if (isA<lduInterface>(this->operator[](patchi)))
         {
@@ -109,15 +104,11 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
 }
 
 
-void fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
 {
     clear();
     addPatches(basicBdry);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index f821234b64..64ea8c4103 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -594,7 +594,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 
     const fvPatchList& patches = boundary();
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         phi.boundaryField()[patchI] = patches[patchI].patchSlice(sweptVols);
         phi.boundaryField()[patchI] *= rDeltaT;
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index e0c8a0514e..a66d58a2e2 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -95,7 +95,7 @@ public:
             patchAddr_(mesh.boundary().size()),
             patchSchedule_(mesh.globalData().patchSchedule())
         {
-            forAll (mesh.boundary(), patchI)
+            forAll(mesh.boundary(), patchI)
             {
                 patchAddr_[patchI] = &mesh.boundary()[patchI].faceCells();
             }
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
index 24caf57a5e..6349467b93 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
@@ -72,7 +72,7 @@ public:
         {
             const fvBoundaryMesh& patches = mesh.boundary();
 
-            forAll (patches, patchI)
+            forAll(patches, patchI)
             {
                 set
                 (
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index c3ef265a18..97fa0b64a3 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -70,7 +70,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         // Adjust mapping to manage hits into other patches and into
         // internal
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if
             (
@@ -118,7 +118,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         // Adjust mapping to manage hits into other patches and into
         // internal
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             labelList& curAddr = addr[faceI];
             scalarList& curW = w[faceI];
@@ -130,7 +130,7 @@ void Foam::fvPatchMapper::calcAddressing() const
             )
             {
                 // No adjustment of weights, just subtract patch start
-                forAll (curAddr, i)
+                forAll(curAddr, i)
                 {
                     curAddr[i] -= oldPatchStart;
                 }
@@ -142,7 +142,7 @@ void Foam::fvPatchMapper::calcAddressing() const
                 scalarField newWeights(curAddr.size());
                 label nActive = 0;
 
-                forAll (curAddr, lfI)
+                forAll(curAddr, lfI)
                 {
                     if
                     (
@@ -178,7 +178,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         if (fvMesh::debug)
         {
-            forAll (addr, i)
+            forAll(addr, i)
             {
                 if (min(addr[i]) < 0)
                 {
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index d820d0f245..7baa5836e6 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -64,7 +64,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         labelList& addr = *directAddrPtr_;
 
         // Adjust for creation of an internal face from a boundary face
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (addr[faceI] > oldNInternal)
             {
@@ -90,7 +90,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         scalarListList& w = *weightsPtr_;
 
         // Adjust for creation of an internal face from a boundary face
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (max(addr[faceI]) >= oldNInternal)
             {
@@ -112,7 +112,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
 
         label nIns = 0;
 
-        forAll (insFaces, faceI)
+        forAll(insFaces, faceI)
         {
             // If the face is internal, keep it here
             if (insFaces[faceI] < size())
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 36413f9ab3..8cd71ce2c2 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -67,7 +67,7 @@ void Foam::fvMeshSubset::markPoints
     Map<label>& pointMap
 )
 {
-    forAll (curPoints, pointI)
+    forAll(curPoints, pointI)
     {
         // Note: insert will only insert if not yet there.
         pointMap.insert(curPoints[pointI], 0);
@@ -81,7 +81,7 @@ void Foam::fvMeshSubset::markPoints
     labelList& pointMap
 )
 {
-    forAll (curPoints, pointI)
+    forAll(curPoints, pointI)
     {
         pointMap[curPoints[pointI]] = 0;
     }
@@ -103,7 +103,7 @@ void Foam::fvMeshSubset::doCoupledPatches
     if (syncPar && Pstream::parRun())
     {
         // Send face usage across processor patches
-        forAll (oldPatches, oldPatchI)
+        forAll(oldPatches, oldPatchI)
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -125,7 +125,7 @@ void Foam::fvMeshSubset::doCoupledPatches
 
 
         // Receive face usage count and check for faces that become uncoupled.
-        forAll (oldPatches, oldPatchI)
+        forAll(oldPatches, oldPatchI)
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -144,7 +144,7 @@ void Foam::fvMeshSubset::doCoupledPatches
 
                 // Combine with this side.
 
-                forAll (pp, i)
+                forAll(pp, i)
                 {
                     if
                     (
@@ -163,7 +163,7 @@ void Foam::fvMeshSubset::doCoupledPatches
     }
 
     // Do same for cyclics.
-    forAll (oldPatches, oldPatchI)
+    forAll(oldPatches, oldPatchI)
     {
         const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -172,7 +172,7 @@ void Foam::fvMeshSubset::doCoupledPatches
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
 
-            forAll (cycPatch, i)
+            forAll(cycPatch, i)
             {
                 label thisFaceI = cycPatch.start() + i;
                 label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
@@ -405,12 +405,12 @@ void Foam::fvMeshSubset::setCellSubset
 
     Map<label> facesToSubset(avgNFacesPerCell*nCellsInSet);
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         // Mark all faces from the cell
         const labelList& curFaces = oldCells[cellMap_[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!facesToSubset.found(curFaces[faceI]))
             {
@@ -437,7 +437,7 @@ void Foam::fvMeshSubset::setCellSubset
     faceMap_.setSize(facesToc.size());
 
     // 1. Get all faces that will be internal to the submesh.
-    forAll (facesToc, faceI)
+    forAll(facesToc, faceI)
     {
         if (facesToSubset[facesToc[faceI]] == 2)
         {
@@ -528,7 +528,7 @@ void Foam::fvMeshSubset::setCellSubset
     pointMap_ = globalPointMap.toc();
     sort(pointMap_);
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         globalPointMap[pointMap_[pointI]] = pointI;
     }
@@ -542,7 +542,7 @@ void Foam::fvMeshSubset::setCellSubset
 
     label nNewPoints = 0;
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
         nNewPoints++;
@@ -559,7 +559,7 @@ void Foam::fvMeshSubset::setCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -626,7 +626,7 @@ void Foam::fvMeshSubset::setCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -642,13 +642,13 @@ void Foam::fvMeshSubset::setCellSubset
 
     label nNewCells = 0;
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         const labelList& oldC = oldCells[cellMap_[cellI]];
 
         labelList newC(oldC.size());
 
-        forAll (newC, i)
+        forAll(newC, i)
         {
             newC[i] = globalFaceMap[oldC[i]];
         }
@@ -790,7 +790,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
     cellMap_.setSize(oldCells.size());
     label nCellsInSet = 0;
 
-    forAll (region, oldCellI)
+    forAll(region, oldCellI)
     {
         if (region[oldCellI] == currentRegion)
         {
@@ -813,7 +813,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
     labelList nCellsUsingFace(oldFaces.size(), 0);
 
     label nFacesInSet = 0;
-    forAll (oldFaces, oldFaceI)
+    forAll(oldFaces, oldFaceI)
     {
         bool faceUsed = false;
 
@@ -936,7 +936,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         label oldFaceI = oldPatch.start();
 
-        forAll (oldPatch, i)
+        forAll(oldPatch, i)
         {
             if (nCellsUsingFace[oldFaceI] == 1)
             {
@@ -1005,7 +1005,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         label oldFaceI = oldPatch.start();
 
-        forAll (oldPatch, i)
+        forAll(oldPatch, i)
         {
             if (nCellsUsingFace[oldFaceI] == 1)
             {
@@ -1068,7 +1068,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     label nNewPoints = 0;
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
         nNewPoints++;
@@ -1085,7 +1085,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -1120,7 +1120,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
         // Relabel vertices of the (possibly turned) face.
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -1136,13 +1136,13 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     label nNewCells = 0;
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         const labelList& oldC = oldCells[cellMap_[cellI]];
 
         labelList newC(oldC.size());
 
-        forAll (newC, i)
+        forAll(newC, i)
         {
             newC[i] = globalFaceMap[oldC[i]];
         }
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index e6afee8dcf..4a7078723c 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -51,7 +51,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<fvPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
@@ -175,7 +175,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<fvsPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
@@ -308,7 +308,7 @@ fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<pointPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 65cb947b6a..c546459875 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -114,7 +114,7 @@ tmp<vectorField> fvPatch::Cn() const
     // get reference to global cell centres
     const vectorField& gcc = boundaryMesh().mesh().cellCentres();
 
-    forAll (faceCells, faceI)
+    forAll(faceCells, faceI)
     {
         cc[faceI] = gcc[faceCells[faceI]];
     }
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
index b3c314c8ef..aeaaaf020a 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
@@ -83,7 +83,7 @@ void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()
     // Flip the flux
     const labelList flipFaces = mapper.surfaceMap().flipFaceFlux().toc();
 
-    forAll (flipFaces, i)
+    forAll(flipFaces, i)
     {
         if (flipFaces[i] < field.size())
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index 5a005b8a38..525b63a6e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -155,7 +155,7 @@ public:
             clippedLinearWeights.internalField() =
                 max(min(cdWeights.internalField(), 1 - wfLimit_), wfLimit_);
 
-            forAll (mesh.boundary(), patchi)
+            forAll(mesh.boundary(), patchi)
             {
                 if (mesh.boundary()[patchi].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index f6c01aabd1..934f3739c4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -169,7 +169,7 @@ public:
                 );
             }
 
-            forAll (sfCorr.boundaryField(), pi)
+            forAll(sfCorr.boundaryField(), pi)
             {
                 if (!sfCorr.boundaryField()[pi].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index f250150bd6..23b12d051f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -127,7 +127,7 @@ public:
             reverseLinearWeights.internalField() =
                 1.0 - cdWeights.internalField();
 
-            forAll (mesh.boundary(), patchI)
+            forAll(mesh.boundary(), patchI)
             {
                 if (mesh.boundary()[patchI].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 2d3bdf425e..0a51f574f1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -213,7 +213,7 @@ surfaceInterpolationScheme<Type>::interpolate
 
     // Interpolate across coupled patches using given lambdas and ys
 
-    forAll (lambdas.boundaryField(), pi)
+    forAll(lambdas.boundaryField(), pi)
     {
         const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
         const fvsPatchScalarField& pY = ys.boundaryField()[pi];
@@ -291,7 +291,7 @@ surfaceInterpolationScheme<Type>::interpolate
 
     // Interpolate across coupled patches using given lambdas
 
-    forAll (lambdas.boundaryField(), pi)
+    forAll(lambdas.boundaryField(), pi)
     {
         const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
 
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 4f41fdc2a8..f310615f82 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -56,12 +56,12 @@ makeCompactCellFaceAddressingAndFaceWeights
     // Number of neighbours for each cell
     labelList nNbrs(nFineCells, 0);
 
-    forAll (upperAddr, facei)
+    forAll(upperAddr, facei)
     {
         nNbrs[upperAddr[facei]]++;
     }
 
-    forAll (lowerAddr, facei)
+    forAll(lowerAddr, facei)
     {
         nNbrs[lowerAddr[facei]]++;
     }
@@ -73,7 +73,7 @@ makeCompactCellFaceAddressingAndFaceWeights
 
 
     cellCellOffsets[0] = 0;
-    forAll (nNbrs, celli)
+    forAll(nNbrs, celli)
     {
         cellCellOffsets[celli+1] = cellCellOffsets[celli] + nNbrs[celli];
     }
@@ -81,7 +81,7 @@ makeCompactCellFaceAddressingAndFaceWeights
     // reset the whole list to use as counter
     nNbrs = 0;
 
-    forAll (upperAddr, facei)
+    forAll(upperAddr, facei)
     {
         label own = upperAddr[facei];
         label nei = lowerAddr[facei];
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 3132bb1f85..2ef5a2a1fc 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
 
     label nPatchFaces = 0;
 
-    forAll (patchNames_, i)
+    forAll(patchNames_, i)
     {
         label pID = bdry.findPatchID(patchNames_[i]);
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 6e93d1d792..ec47a05a6c 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
 
     label nPatchEdges = 0;
 
-    forAll (patchNames_, i)
+    forAll(patchNames_, i)
     {
         label pID = bdry.findPatchID(patchNames_[i]);
 
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index d842671b8d..6ede6f3cf2 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -81,12 +81,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
             << exit(FatalIOError);
     }
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type" && iter().keyword() != "value")
         {
@@ -459,34 +454,31 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
     actualTypeName_(ptf.actualTypeName_),
     dict_(ptf.dict_)
 {
-    for
+    forAllConstIter
     (
-        HashPtrTable<scalarField>::const_iterator iter =
-            ptf.scalarFields_.begin();
-        iter != ptf.scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        ptf.scalarFields_,
+        iter
     )
     {
         scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<vectorField>::const_iterator iter =
-            ptf.vectorFields_.begin();
-        iter != ptf.vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        ptf.vectorFields_,
+        iter
     )
     {
         vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<sphericalTensorField>::const_iterator iter =
-            ptf.sphericalTensorFields_.begin();
-        iter != ptf.sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        ptf.sphericalTensorFields_,
+        iter
     )
     {
         sphericalTensorFields_.insert
@@ -496,12 +488,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<symmTensorField>::const_iterator iter =
-            ptf.symmTensorFields_.begin();
-        iter != ptf.symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        ptf.symmTensorFields_,
+        iter
     )
     {
         symmTensorFields_.insert
@@ -511,12 +502,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<tensorField>::const_iterator iter =
-            ptf.tensorFields_.begin();
-        iter != ptf.tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        ptf.tensorFields_,
+        iter
     )
     {
         tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
@@ -569,53 +559,51 @@ void Foam::genericFvPatchField<Type>::autoMap
 {
     calculatedFvPatchField<Type>::autoMap(m);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
@@ -635,11 +623,11 @@ void Foam::genericFvPatchField<Type>::rmap
     const genericFvPatchField<Type>& dptf =
         refCast<const genericFvPatchField<Type> >(ptf);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -651,11 +639,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -667,12 +655,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -684,12 +671,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -701,11 +687,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -817,12 +803,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type" && iter().keyword() != "value")
         {
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index f8a0c8b608..72da883707 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -62,12 +62,7 @@ genericPointPatchField<Type>::genericPointPatchField
     actualTypeName_(dict.lookup("type")),
     dict_(dict)
 {
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type")
         {
@@ -357,34 +352,21 @@ genericPointPatchField<Type>::genericPointPatchField
     actualTypeName_(ptf.actualTypeName_),
     dict_(ptf.dict_)
 {
-    for
-    (
-        HashPtrTable<scalarField>::const_iterator iter =
-            ptf.scalarFields_.begin();
-        iter != ptf.scalarFields_.end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<scalarField>, ptf.scalarFields_, iter)
     {
         scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
     }
 
-    for
-    (
-        HashPtrTable<vectorField>::const_iterator iter =
-            ptf.vectorFields_.begin();
-        iter != ptf.vectorFields_.end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<vectorField>, ptf.vectorFields_, iter)
     {
         vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<sphericalTensorField>::const_iterator iter =
-            ptf.sphericalTensorFields_.begin();
-        iter != ptf.sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        ptf.sphericalTensorFields_,
+        iter
     )
     {
         sphericalTensorFields_.insert
@@ -394,12 +376,11 @@ genericPointPatchField<Type>::genericPointPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<symmTensorField>::const_iterator iter =
-            ptf.symmTensorFields_.begin();
-        iter != ptf.symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        ptf.symmTensorFields_,
+        iter
     )
     {
         symmTensorFields_.insert
@@ -409,12 +390,11 @@ genericPointPatchField<Type>::genericPointPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<tensorField>::const_iterator iter =
-            ptf.tensorFields_.begin();
-        iter != ptf.tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        ptf.tensorFields_,
+        iter
     )
     {
         tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
@@ -448,53 +428,51 @@ void genericPointPatchField<Type>::autoMap
     const pointPatchFieldMapper& m
 )
 {
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
@@ -512,11 +490,11 @@ void genericPointPatchField<Type>::rmap
     const genericPointPatchField<Type>& dptf =
         refCast<const genericPointPatchField<Type> >(ptf);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -528,11 +506,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -544,12 +522,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -561,12 +538,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -578,11 +554,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -601,12 +577,7 @@ void genericPointPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type")
         {
diff --git a/src/lagrangian/dieselSpray/spray/sprayFunctions.C b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
index 5ff3d5336a..ab4460e938 100644
--- a/src/lagrangian/dieselSpray/spray/sprayFunctions.C
+++ b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
@@ -37,7 +37,7 @@ scalar spray::injectedMass(const scalar t) const
 {
     scalar sum = 0.0;
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         sum += injectors_[i].properties()->injectedMass(t);
     }
@@ -50,7 +50,7 @@ scalar spray::totalMassToInject() const
 {
     scalar sum = 0.0;
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         sum += injectors_[i].properties()->mass();
     }
@@ -67,7 +67,7 @@ scalar spray::injectedEnthalpy
     scalar sum = 0.0;
     label Nf = fuels_->components().size();
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         scalar T = injectors_[i].properties()->T(time);
         scalarField X(injectors_[i].properties()->X());
@@ -93,14 +93,9 @@ scalar spray::liquidMass() const
 {
     scalar sum = 0.0;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        sum += elmnt().m();
+        sum += iter().m();
     }
 
     if (twoD())
@@ -119,30 +114,25 @@ scalar spray::liquidEnthalpy() const
     scalar sum = 0.0;
     label Nf = fuels().components().size();
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        scalar T = elmnt().T();
-        scalar pc = p()[elmnt().cell()];
-        scalar hlat = fuels().hl(pc, T, elmnt().X());
+        scalar T = iter().T();
+        scalar pc = p()[iter().cell()];
+        scalar hlat = fuels().hl(pc, T, iter().X());
         scalar hg = 0.0;
-        scalar Wl = fuels().W(elmnt().X());
+        scalar Wl = fuels().W(iter().X());
 
         for (label j=0; j<Nf; j++)
         {
             label k = liquidToGasIndex_[j];
 
             hg +=
-                gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+                gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
                /Wl;
         }
 
         scalar h = hg - hlat;
-        sum += elmnt().m()*h;
+        sum += iter().m()*h;
     }
 
     if (twoD())
@@ -161,33 +151,28 @@ scalar spray::liquidTotalEnthalpy() const
     scalar sum = 0.0;
     label Nf = fuels().components().size();
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        label celli = elmnt().cell();
-        scalar T = elmnt().T();
+        label celli = iter().cell();
+        scalar T = iter().T();
         scalar pc = p()[celli];
-        scalar rho = fuels().rho(pc, T, elmnt().X());
-        scalar hlat = fuels().hl(pc, T, elmnt().X());
+        scalar rho = fuels().rho(pc, T, iter().X());
+        scalar hlat = fuels().hl(pc, T, iter().X());
         scalar hg = 0.0;
-        scalar Wl = fuels().W(elmnt().X());
+        scalar Wl = fuels().W(iter().X());
 
         for (label j=0; j<Nf; j++)
         {
             label k = liquidToGasIndex_[j];
             hg +=
-                gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+                gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
                /Wl;
         }
 
-        scalar psat = fuels().pv(pc, T, elmnt().X());
+        scalar psat = fuels().pv(pc, T, iter().X());
 
         scalar h = hg - hlat + (pc - psat)/rho;
-        sum += elmnt().m()*h;
+        sum += iter().m()*h;
     }
 
     if (twoD())
@@ -204,15 +189,11 @@ scalar spray::liquidTotalEnthalpy() const
 scalar spray::liquidKineticEnergy() const
 {
     scalar sum = 0.0;
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+
+    forAllConstIter(spray, *this, iter)
     {
-        scalar ke = pow(mag(elmnt().U()), 2.0);
-        sum += elmnt().m()*ke;
+        const scalar ke = pow(mag(iter().U()), 2.0);
+        sum += iter().m()*ke;
     }
 
     if (twoD())
@@ -286,13 +267,13 @@ scalar spray::liquidPenetration
 
         for
         (
-            spray::const_iterator elmnt = ++first;
-            elmnt != end();
-            ++elmnt
+            spray::const_iterator iter = ++first;
+            iter != end();
+            ++iter
         )
         {
-            scalar de = mag(elmnt().position() - ip);
-            scalar me = elmnt().m();
+            scalar de = mag(iter().position() - ip);
+            scalar me = iter().m();
             mTot += me;
 
             n++;
@@ -357,8 +338,8 @@ scalar spray::liquidPenetration
     {
         if (Np > 0)
         {
-            spray::const_iterator elmnt = begin();
-            d = mag(elmnt().position() - ip);
+            spray::const_iterator iter = begin();
+            d = mag(iter().position() - ip);
         }
     }
 
@@ -372,20 +353,15 @@ scalar spray::smd() const
 {
     scalar numerator = 0.0, denominator = VSMALL;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        label celli = elmnt().cell();
+        label celli = iter().cell();
         scalar Pc = p()[celli];
-        scalar T = elmnt().T();
-        scalar rho = fuels_->rho(Pc, T, elmnt().X());
+        scalar T = iter().T();
+        scalar rho = fuels_->rho(Pc, T, iter().X());
 
-        scalar tmp = elmnt().N(rho)*pow(elmnt().d(), 2.0);
-        numerator += tmp*elmnt().d();
+        scalar tmp = iter().N(rho)*pow(iter().d(), 2.0);
+        numerator += tmp*iter().d();
         denominator += tmp;
     }
 
@@ -400,14 +376,9 @@ scalar spray::maxD() const
 {
     scalar maxD = 0.0;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        maxD = max(maxD, elmnt().d());
+        maxD = max(maxD, iter().d());
     }
 
     reduce(maxD, maxOp<scalar>());
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 537bdeb457..27b800b9a4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -86,7 +86,7 @@ void Foam::LISA::atomizeParcel
     scalar Taverage = p.T() + (temperature - p.T())/3.0;
     scalar Winv = 0.0;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         Winv += Y[i][cellI]/spray_.gasProperties()[i].W();
     }
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index 83136134d0..c0ca1a42f9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
@@ -74,20 +74,15 @@ void Foam::gradientDispersionRAS::disperseParcels() const
     const volScalarField& epsilon = turbulence().epsilon();
     const volVectorField& U = spray_.U();
 
-    for
-    (
-        spray::iterator elmnt = spray_.begin();
-        elmnt != spray_.end();
-        ++elmnt
-    )
+    forAllIter(spray, spray_, elmnt)
     {
-        label celli = elmnt().cell();
-        scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+        const label cellI = elmnt().cell();
+        scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
 
         scalar Tturb = min
         (
-            k[celli]/epsilon[celli],
-            cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+            k[cellI]/epsilon[cellI],
+            cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
         );
         // parcel is perturbed by the turbulence
         if (dt < Tturb)
@@ -98,8 +93,8 @@ void Foam::gradientDispersionRAS::disperseParcels() const
             {
                 elmnt().tTurb() = 0.0;
 
-                scalar sigma = sqrt(2.0*k[celli]/3.0);
-                vector dir = -gradk[celli]/(mag(gradk[celli]) + SMALL);
+                scalar sigma = sqrt(2.0*k[cellI]/3.0);
+                vector dir = -gradk[cellI]/(mag(gradk[cellI]) + SMALL);
 
                 // numerical recipes... Ch. 7. Random Numbers...
                 scalar x1 = 0.0;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index a8a01af486..f18136ceb7 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
@@ -75,20 +75,15 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
     const volScalarField& epsilon = turbulence().epsilon();
     const volVectorField& U = spray_.U();
 
-    for
-    (
-        spray::iterator elmnt = spray_.begin();
-        elmnt != spray_.end();
-        ++elmnt
-    )
+    forAllIter(spray, spray_, elmnt)
     {
-        label celli = elmnt().cell();
-        scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+        const label cellI = elmnt().cell();
+        scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
 
         scalar Tturb = min
         (
-            k[celli]/epsilon[celli],
-            cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+            k[cellI]/epsilon[cellI],
+            cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
         );
 
         // parcel is perturbed by the turbulence
@@ -100,7 +95,7 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
             {
                 elmnt().tTurb() = 0.0;
 
-                scalar sigma = sqrt(2.0*k[celli]/3.0);
+                scalar sigma = sqrt(2.0*k[cellI]/3.0);
                 vector dir = 2.0*spray_.rndGen().vector01() - one;
                 dir /= mag(dir) + SMALL;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 2e624cd17e..1ea4911172 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -112,7 +112,7 @@ Foam::ReactingCloud<ParcelType>::Srho() const
     );
 
     scalarField& sourceField = trhoTrans().field();
-    forAll (rhoTrans_, i)
+    forAll(rhoTrans_, i)
     {
         sourceField += rhoTrans_[i];
     }
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 0ff34c56c4..a0484aa90d 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -78,7 +78,7 @@ void Foam::phaseProperties::setGlobalCarrierIds
 
     forAll(names_, i)
     {
-        forAll (carrierNames, j)
+        forAll(carrierNames, j)
         {
             if (carrierNames[j] == names_[i])
             {
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index e7380f9dff..42a34782c6 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -340,7 +340,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
 
         scalar checkNormalisation = 0;
 
-        forAll (oldDist, oD)
+        forAll(oldDist, oD)
         {
             checkNormalisation += oldDist[oD].second()*binWidth_;
         }
@@ -404,7 +404,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
     {
         scalar checkNormalisation = 0;
 
-        forAll (newDist, nD)
+        forAll(newDist, nD)
         {
             checkNormalisation += newDist[nD].second()*binWidth_;
         }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
index f4b0c60ed0..56d1e2046d 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
@@ -45,7 +45,7 @@ void Foam::directInteractionList::buildDirectInteractionList
 
         label pointJIndex;
 
-        forAll (mesh.points(), pointIIndex)
+        forAll(mesh.points(), pointIIndex)
         {
             for
             (
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
index bd69fbacbc..a0ff1b2645 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
@@ -271,7 +271,7 @@ bool Foam::interactionLists::testPointFaceDistance
 {
     const vector& pointPosition(mesh_.points()[p]);
 
-    forAll (refCell.faces(), rCF)
+    forAll(refCell.faces(), rCF)
     {
         if
         (
@@ -524,7 +524,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
     {
         const label f = segmentFaces[sF];
 
-        forAll (mesh_.points(), p)
+        forAll(mesh_.points(), p)
         {
             if (testPointFaceDistance(p, f))
             {
@@ -577,7 +577,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
     {
         const edge& eJ(mesh_.edges()[segmentEdges[sE]]);
 
-        forAll (mesh_.edges(), edgeIIndex)
+        forAll(mesh_.edges(), edgeIIndex)
         {
             const edge& eI(mesh_.edges()[edgeIIndex]);
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
index 020eb637ae..602ab7b497 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
@@ -106,13 +106,13 @@ bool operator==
 
     Foam::List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         Foam::labelList curLList = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLList)
             {
@@ -131,7 +131,7 @@ bool operator==
     // check if all LLists on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
index e73f9a6e3a..b25901edc9 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
@@ -104,13 +104,13 @@ bool operator==
 
     Foam::List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         Foam::label curLabel = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLabel)
             {
@@ -129,7 +129,7 @@ bool operator==
     // check if all labels on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
index cc6f8b7d26..b0d951113b 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -166,7 +166,7 @@ void Foam::referredCellList::buildReferredCellList
 
             procPatchSegMap.setSize(patch.size());
 
-            forAll (patch, pI)
+            forAll(patch, pI)
             {
                 label decomposedMeshFace = patch.start() + pI;
 
@@ -298,7 +298,7 @@ void Foam::referredCellList::buildReferredCellList
 
                 DynamicList<tensor> refTrans;
 
-                forAll (patch, faceI)
+                forAll(patch, faceI)
                 {
                     if (processorPatchSegmentMapping[pP][faceI] == nUP)
                     {
@@ -363,7 +363,7 @@ void Foam::referredCellList::buildReferredCellList
     {
         label refIntListStartSize = referredInteractionList.size();
 
-        forAll (mesh.boundaryMesh(), patchI)
+        forAll(mesh.boundaryMesh(), patchI)
         {
             // Treat local cyclics on each processor before processor
             // boundaries.  Separate treatment allows the serial version to run
@@ -473,7 +473,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -492,7 +492,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -703,7 +703,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -724,7 +724,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -948,7 +948,7 @@ void Foam::referredCellList::buildReferredCellList
 
                     DynamicList<label> meshFacesOnThisSegment;
 
-                    forAll (patch, faceI)
+                    forAll(patch, faceI)
                     {
                         if (processorPatchSegmentMapping[pP][faceI] == nUP)
                         {
@@ -976,7 +976,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -997,7 +997,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -1398,7 +1398,7 @@ void Foam::referredCellList::buildReferredCellList
 
 //         scalar rCutMaxSqr = molCloud_.rCutMax()*molCloud_.rCutMax();
 //
-//         forAll (molCloud_.mesh().points(), pointIIndex)
+//         forAll(molCloud_.mesh().points(), pointIIndex)
 //         {
 //             const point& ptI
 //             (
@@ -1485,7 +1485,7 @@ void Foam::referredCellList::referMolecules
         {
             List<molecule*> realMols = cellOccupancy[sRL[sRLI]];
 
-            forAll (realMols, rM)
+            forAll(realMols, rM)
             {
                 molecule* mol = realMols[rM];
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index 4e93070479..5a195aa938 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -6,7 +6,7 @@ if (runTime.outputTime())
 
     scalarField totalRhoN_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesRhoN, rN)
+    forAll(allSpeciesRhoN, rN)
     {
         allSpeciesRhoN[rN].internalField() =
             allSpeciesN_RU[rN]
@@ -25,7 +25,7 @@ if (runTime.outputTime())
 
     scalarField totalRhoM_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesRhoM, rM)
+    forAll(allSpeciesRhoM, rM)
     {
         allSpeciesRhoM[rM].internalField() =
             allSpeciesM_RU[rM]
@@ -45,7 +45,7 @@ if (runTime.outputTime())
 
     scalarField totalMass_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesVelocity, v)
+    forAll(allSpeciesVelocity, v)
     {
         // A check for 1/0 molecules is required.
 
@@ -99,7 +99,7 @@ if (runTime.outputTime())
 
     scalarField totalN_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesTemperature, t)
+    forAll(allSpeciesTemperature, t)
     {
         // A check for 1/0 molecules is required.
 
@@ -170,7 +170,7 @@ if (runTime.outputTime())
 
     scalarField totalKE_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesMeanKE, mKE)
+    forAll(allSpeciesMeanKE, mKE)
     {
         // A check for 1/0 molecules is required.
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index f604b8f3b8..c835ba5048 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -25,20 +25,14 @@ License
 
 if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     Field<vector> uVals(molecules.size());
 
     label uV = 0;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol, uV++
-    )
+    // or forAllConstIter
+    forAllIter(IDLList<molecule>, molecules, mol)
     {
-        uVals[uV] = mol().U();
+        uVals[uV++] = mol().U();
     }
 
     vacf.calculateCorrelationFunction(uVals);
@@ -46,16 +40,10 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     vector p = vector::zero;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    // or forAllConstIter
+    forAllIter(IDLList<molecule>, molecules, mol)
     {
         p.x() +=
             mol().mass() * mol().U().y() * mol().U().z()
@@ -75,17 +63,10 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
 {
-
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     vector s = vector::zero;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    // or forAllConstIter
+    forAllIter(IDLList<molecule>, molecules, mol)
     {
         s +=
         (
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index 50e82df48a..6d6617d652 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -37,7 +37,7 @@ PtrList<volScalarField> allSpeciesRhoN
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesRhoN, rN)
+forAll(allSpeciesRhoN, rN)
 {
     Info<< "    Creating number density field for "
         << molecules.potential().idList()[rN] << endl;
@@ -92,7 +92,7 @@ PtrList<volScalarField> allSpeciesRhoM
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesRhoM, rM)
+forAll(allSpeciesRhoM, rM)
 {
     Info<< "    Creating mass density field for "
         << molecules.potential().idList()[rM] << endl;
@@ -147,7 +147,7 @@ PtrList<volVectorField> allSpeciesVelocity
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesVelocity, v)
+forAll(allSpeciesVelocity, v)
 {
     Info<< "    Creating velocity field for "
         << molecules.potential().idList()[v] << endl;
@@ -221,7 +221,7 @@ PtrList<volScalarField> allSpeciesTemperature
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesTemperature, t)
+forAll(allSpeciesTemperature, t)
 {
     Info<< "    Creating temperature field for "
         << molecules.potential().idList()[t] << endl;
@@ -277,7 +277,7 @@ PtrList<volScalarField> allSpeciesMeanKE
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesMeanKE, mKE)
+forAll(allSpeciesMeanKE, mKE)
 {
     Info<< "    Creating mean kinetic energy field for "
         << molecules.potential().idList()[mKE] << endl;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 193dbcc723..97bfab9dce 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -54,11 +54,9 @@ label singleStepNMols = molecules.size();
 label singleStepDOFs = 0;
 
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     for
     (
-        mol = molecules.begin();
+        IDLList<molecule>::iterator mol = molecules.begin();
         mol != molecules.end();
         ++mol
     )
@@ -79,7 +77,7 @@ label singleStepDOFs = 0;
 
     for
     (
-        mol = molecules.begin();
+        IDLList<molecule>::iterator mol = molecules.begin();
         mol != molecules.end();
         ++mol
     )
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 71cdac097d..b6d93b721d 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -348,7 +348,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
             }
         }
 
-        forAll (molsToDelete, mTD)
+        forAll(molsToDelete, mTD)
         {
             deleteParticle(*(molsToDelete[mTD]));
         }
@@ -438,7 +438,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
             }
         }
 
-        forAll (molsToDelete, mTD)
+        forAll(molsToDelete, mTD)
         {
             deleteParticle(*(molsToDelete[mTD]));
         }
@@ -475,7 +475,7 @@ void Foam::moleculeCloud::initialiseMolecules
             << abort(FatalError);
     }
 
-    forAll (cellZones, z)
+    forAll(cellZones, z)
     {
         const cellZone& zone(cellZones[z]);
 
@@ -632,7 +632,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 vector zoneMax = -VGREAT*vector::one;
 
-                forAll (zone, cell)
+                forAll(zone, cell)
                 {
                     const point cellCentre = mesh_.cellCentres()[zone[cell]];
 
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index a2a1594878..dbc8bf29fb 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -36,10 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(cellClassification, 0);
-}
+defineTypeNameAndDebug(Foam::cellClassification, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -829,15 +826,10 @@ Foam::label Foam::cellClassification::fillRegionPoints
 
         label nChanged = 0;
 
-        for
-        (
-            labelHashSet::const_iterator iter = nonManifoldPoints.begin();
-            iter != nonManifoldPoints.end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, nonManifoldPoints, iter)
         {
             // Find a face on fp using point and remove it.
-            label patchPointI = meshPointMap[iter.key()];
+            const label patchPointI = meshPointMap[iter.key()];
 
             const labelList& pFaces = fp.pointFaces()[patchPointI];
 
@@ -846,16 +838,14 @@ Foam::label Foam::cellClassification::fillRegionPoints
             // one would be best to remove.
             forAll(pFaces, i)
             {
-                label patchFaceI = pFaces[i];
-
-                label ownerCell = outsideOwner[patchFaceI];
+                const label patchFaceI = pFaces[i];
+                const label ownerCell  = outsideOwner[patchFaceI];
 
                 if (operator[](ownerCell) == meshType)
                 {
                     operator[](ownerCell) = fillType;
 
                     nChanged++;
-
                     break;
                 }
             }
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 6a6ec54180..99afc59181 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -57,7 +57,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         vector s = areas[faceI];
@@ -71,7 +71,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
         result[nei[faceI]] = max(cosDDotS, result[nei[faceI]]);
     }
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -119,7 +119,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         scalar dOwn = mag
         (
@@ -144,7 +144,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
         result[nei[faceI]] = max(skewness, result[nei[faceI]]);
     }
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -196,7 +196,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         vector s = areas[faceI];
@@ -210,7 +210,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
 
     label globalFaceI = mesh_.nInternalFaces();
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -257,7 +257,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         scalar dOwn = mag
         (
@@ -281,7 +281,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
 
     label globalFaceI = mesh_.nInternalFaces();
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 6bfeadbd62..4ae5ffc616 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -360,7 +360,7 @@ Foam::label Foam::meshSearch::findNearestBoundaryFaceWalk
 
         const labelList& myEdges = mesh_.faceEdges()[curFaceI];
 
-        forAll (myEdges, myEdgeI)
+        forAll(myEdges, myEdgeI)
         {
             const labelList& neighbours = mesh_.edgeFaces()[myEdges[myEdgeI]];
 
diff --git a/src/meshTools/octree/octreeDataFace.C b/src/meshTools/octree/octreeDataFace.C
index 7cc8e87905..23d0664ff7 100644
--- a/src/meshTools/octree/octreeDataFace.C
+++ b/src/meshTools/octree/octreeDataFace.C
@@ -45,7 +45,7 @@ void Foam::octreeDataFace::calcBb()
     allBb_.setSize(meshFaces_.size());
     allBb_ = treeBoundBox::invertedBox;
 
-    forAll (meshFaces_, i)
+    forAll(meshFaces_, i)
     {
         // Update bb of face
         treeBoundBox& myBb = allBb_[i];
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 5c45ea1a01..029d85d6a4 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -76,7 +76,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         const faceList& oldFaces = mesh.faces();
         const labelListList& pFaces = mesh.pointFaces();
 
-        forAll (Cells, cellI)
+        forAll(Cells, cellI)
         {
             const labelList& curFaces = Cells[cellI];
             const edgeList cellEdges = Cells[cellI].edges(oldFaces);
@@ -86,15 +86,15 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             labelList edgeUsage(cellEdges.size(), 0);
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 edgeList curFaceEdges = oldFaces[curFaces[faceI]].edges();
 
-                forAll (curFaceEdges, faceEdgeI)
+                forAll(curFaceEdges, faceEdgeI)
                 {
                     const edge& curEdge = curFaceEdges[faceEdgeI];
 
-                    forAll (cellEdges, cellEdgeI)
+                    forAll(cellEdges, cellEdgeI)
                     {
                         if (cellEdges[cellEdgeI] == curEdge)
                         {
@@ -108,7 +108,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             edgeList singleEdges(cellEdges.size());
             label nSingleEdges = 0;
 
-            forAll (edgeUsage, edgeI)
+            forAll(edgeUsage, edgeI)
             {
                 if (edgeUsage[edgeI] == 1)
                 {
@@ -124,7 +124,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         << "in mesh structure. " << endl;
 
 #                   ifdef DEBUG_ZIPUP
-                    forAll (curFaces, faceI)
+                    forAll(curFaces, faceI)
                     {
                         Info<< "face: " << oldFaces[curFaces[faceI]]
                             << endl;
@@ -134,7 +134,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         << "Edge usage: " << edgeUsage << nl
                         << "Cell points: " << cellPoints << endl;
 
-                    forAll (cellPoints, cpI)
+                    forAll(cellPoints, cpI)
                     {
                         Info<< "vertex create \"" << cellPoints[cpI]
                             << "\" coordinates "
@@ -155,7 +155,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #           ifdef DEBUG_ZIPUP
             Info<< "Cell " << cellI << endl;
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 Info<< "face: " << oldFaces[curFaces[faceI]] << endl;
             }
@@ -165,7 +165,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 << "Single edges: " << singleEdges << nl
                 << "Cell points: " << cellPoints << endl;
 
-            forAll (cellPoints, cpI)
+            forAll(cellPoints, cpI)
             {
                 Info<< "vertex create \"" << cellPoints[cpI]
                     << "\" coordinates "
@@ -179,11 +179,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             labelList pointUsage(cellPoints.size(), 0);
 
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 const edge& curEdge = singleEdges[edgeI];
 
-                forAll (cellPoints, pointI)
+                forAll(cellPoints, pointI)
                 {
                     if
                     (
@@ -200,7 +200,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             // loop through all edges and eliminate the ones that are
             // blocked out
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 bool blockedHead = false;
                 bool blockedTail = false;
@@ -209,7 +209,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 label newEdgeEnd = singleEdges[edgeI].end();
 
                 // check that the edge has not got all ends blocked
-                forAll (cellPoints, pointI)
+                forAll(cellPoints, pointI)
                 {
                     if (cellPoints[pointI] == newEdgeStart)
                     {
@@ -242,7 +242,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             label nEdgesToInsert = 0;
 
             // Find a good edge
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 SLList<label> pointChain;
 
@@ -266,7 +266,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #                   endif
 
                     // Check if head or tail are blocked
-                    forAll (cellPoints, pointI)
+                    forAll(cellPoints, pointI)
                     {
                         if (cellPoints[pointI] == newEdgeStart)
                         {
@@ -299,7 +299,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     {
                         stopSearching = false;
 
-                        forAll (singleEdges, addEdgeI)
+                        forAll(singleEdges, addEdgeI)
                         {
                             if (!singleEdgeUsage[addEdgeI])
                             {
@@ -361,7 +361,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     << " curEdgeEnd: " << curEdgeEnd << endl;
 #                               endif
 
-                                forAll (cellPoints, pointI)
+                                forAll(cellPoints, pointI)
                                 {
                                     if (cellPoints[pointI] == curEdgeStart)
                                     {
@@ -431,7 +431,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #           endif
 
             // Insert the edges into a list of faces
-            forAll (edgesToInsert, edgeToInsertI)
+            forAll(edgesToInsert, edgeToInsertI)
             {
                 // Order the points of the edge
                 // Warning: the ordering must be parametric, because in
@@ -460,12 +460,12 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 labelList orderedEdge(unorderedEdge.size(), -1);
                 boolList used(unorderedEdge.size(), false);
 
-                forAll (orderedEdge, epI)
+                forAll(orderedEdge, epI)
                 {
                     label nextPoint = -1;
                     scalar minDist = GREAT;
 
-                    forAll (dist, i)
+                    forAll(dist, i)
                     {
                         if (!used[i] && dist[i] < minDist)
                         {
@@ -485,7 +485,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #               endif
 
                 // check for duplicate points in the ordered edge
-                forAll (orderedEdge, checkI)
+                forAll(orderedEdge, checkI)
                 {
                     for
                     (
@@ -520,16 +520,16 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 labelList facesSharingEdge(startPF.size() + endPF.size());
                 label nfse = 0;
 
-                forAll (startPF, pfI)
+                forAll(startPF, pfI)
                 {
                     facesSharingEdge[nfse++] = startPF[pfI];
                 }
-                forAll (endPF, pfI)
+                forAll(endPF, pfI)
                 {
                     facesSharingEdge[nfse++] = endPF[pfI];
                 }
 
-                forAll (facesSharingEdge, faceI)
+                forAll(facesSharingEdge, faceI)
                 {
                     bool faceChanges = false;
 
@@ -539,7 +539,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     const edgeList curFaceEdges =
                         oldFaces[currentFaceIndex].edges();
 
-                    forAll (curFaceEdges, cfeI)
+                    forAll(curFaceEdges, cfeI)
                     {
                         if (curFaceEdges[cfeI] == testEdge)
                         {
@@ -567,11 +567,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
                         bool allPointsPresent = true;
 
-                        forAll (orderedEdge, oeI)
+                        forAll(orderedEdge, oeI)
                         {
                             bool curPointFound = false;
 
-                            forAll (newFace, nfI)
+                            forAll(newFace, nfI)
                             {
                                 if (newFace[nfI] == orderedEdge[oeI])
                                 {
@@ -611,7 +611,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
                             bool edgeAdded = false;
 
-                            forAll (newFaceEdges, curFacEdgI)
+                            forAll(newFaceEdges, curFacEdgI)
                             {
                                 // Does the current edge change?
                                 if (newFaceEdges[curFacEdgI] == testEdge)
@@ -679,7 +679,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #                           endif
 
                             // Check for duplicate points in the new face
-                            forAll (newFace, checkI)
+                            forAll(newFace, checkI)
                             {
                                 for
                                 (
@@ -745,7 +745,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         labelList patchSizes(bMesh.size(), 0);
         labelList patchStarts(bMesh.size(), 0);
 
-        forAll (bMesh, patchI)
+        forAll(bMesh, patchI)
         {
             patchSizes[patchI] = bMesh[patchI].size();
             patchStarts[patchI] = bMesh[patchI].start();
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index d00d42c8da..70bfa897a9 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -859,7 +859,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 
     // Do decomposition according to triangle centre
     pointField triCentres(s.size());
-    forAll (s, triI)
+    forAll(s, triI)
     {
         triCentres[triI] = s[triI].centre(s.points());
     }
@@ -879,7 +879,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         bbs[procI][0].max() = point(-VGREAT, -VGREAT, -VGREAT);
     }
 
-    forAll (s, triI)
+    forAll(s, triI)
     {
         point& bbMin = bbs[distribution[triI]][0].min();
         point& bbMax = bbs[distribution[triI]][0].max();
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 39b48a838d..a1ab4a2699 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -73,18 +73,13 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
 
     // Handle owner/neighbour/any selection
-    for
-    (
-        faceSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, loadedSet, iter)
     {
-        label faceI = iter.key();
+        const label faceI = iter.key();
 
         if ((option_ == OWNER) || (option_ == ANY))
         {
-            label cellI = mesh_.faceOwner()[faceI];
+            const label cellI = mesh_.faceOwner()[faceI];
 
             addOrDelete(set, cellI, add);
         }
@@ -93,7 +88,7 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
         {
             if ((option_ == NEIGHBOUR) || (option_ == ANY))
             {
-                label cellI = mesh_.faceNeighbour()[faceI];
+                const label cellI = mesh_.faceNeighbour()[faceI];
 
                 addOrDelete(set, cellI, add);
             }
@@ -107,16 +102,10 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
         Map<label> facesPerCell(loadedSet.size());
 
-        for
-        (
-            faceSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(faceSet, loadedSet, iter)
         {
-            label faceI = iter.key();
-
-            label own = mesh_.faceOwner()[faceI];
+            const label faceI = iter.key();
+            const label own = mesh_.faceOwner()[faceI];
 
             Map<label>::iterator fndOwn = facesPerCell.find(own);
 
@@ -148,14 +137,9 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
         // Include cells that are referenced as many times as they have faces
         // -> all faces in set.
-        for
-        (
-            Map<label>::const_iterator iter = facesPerCell.begin();
-            iter != facesPerCell.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, facesPerCell, iter)
         {
-            label cellI = iter.key();
+            const label cellI = iter.key();
 
             if (iter() == mesh_.cells()[cellI].size())
             {
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 84913bbc70..42faac845b 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -72,15 +72,9 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
     // Handle any selection
     if (option_ == ANY)
     {
-        for
-        (
-            pointSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pCells = mesh_.pointCells()[pointI];
 
             forAll(pCells, pCellI)
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 882c0a6e0b..431fad348c 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -79,15 +79,9 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
     if (option_ == ALL)
     {
         // Add all faces from cell
-        for
-        (
-            cellSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(cellSet, loadedSet, iter)
         {
-            label cellI = iter.key();
-
+            const label cellI = iter.key();
             const labelList& cFaces = mesh_.cells()[cellI];
 
             forAll(cFaces, cFaceI)
@@ -100,7 +94,7 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
     {
         // Add all faces whose both neighbours are in set.
 
-        label nInt = mesh_.nInternalFaces();
+        const label nInt = mesh_.nInternalFaces();
         const labelList& own = mesh_.faceOwner();
         const labelList& nei = mesh_.faceNeighbour();
         const polyBoundaryMesh& patches = mesh_.boundaryMesh();
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index b3c7b9aa9c..92dd470149 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -73,15 +73,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
     if (option_ == ANY)
     {
         // Add faces with any point in loadedSet
-        for
-        (
-            pointSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pFaces = mesh_.pointFaces()[pointI];
 
             forAll(pFaces, pFaceI)
@@ -99,13 +93,12 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
 
         forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pFaces = mesh_.pointFaces()[pointI];
 
             forAll(pFaces, pFaceI)
             {
-                label faceI = pFaces[pFaceI];
+                const label faceI = pFaces[pFaceI];
 
                 Map<label>::iterator fndFace = numPoints.find(faceI);
 
@@ -123,14 +116,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
 
         // Include faces that are referenced as many times as there are points
         // in face -> all points of face
-        for
-        (
-            Map<label>::const_iterator iter = numPoints.begin();
-            iter != numPoints.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, numPoints, iter)
         {
-            label faceI = iter.key();
+            const label faceI = iter.key();
 
             if (iter() == mesh_.faces()[faceI].size())
             {
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index a33dab098d..bd727589fe 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -68,15 +68,9 @@ void Foam::cellToPoint::combine(topoSet& set, const bool add) const
     cellSet loadedSet(mesh_, setName_);
 
     // Add all point from cells in loadedSet
-    for
-    (
-        cellSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(cellSet, loadedSet, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cFaces = mesh_.cells()[cellI];
 
         forAll(cFaces, cFaceI)
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 2f906e3d6c..a4fff893dc 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -68,12 +68,7 @@ void Foam::faceToPoint::combine(topoSet& set, const bool add) const
     faceSet loadedSet(mesh_, setName_);
 
     // Add all points from faces in loadedSet
-    for
-    (
-        faceSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, loadedSet, iter)
     {
         const face& f = mesh_.faces()[iter.key()];
 
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 21c359db05..1dea0b0e9b 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -182,7 +182,7 @@ void faceSet::sync(const polyMesh& mesh)
     }
 
     // Couple cyclic patches
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const polyPatch& pp = patches[patchI];
 
@@ -191,7 +191,7 @@ void faceSet::sync(const polyMesh& mesh)
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
 
-            forAll (cycPatch, i)
+            forAll(cycPatch, i)
             {
                 label thisFaceI = cycPatch.start() + i;
                 label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 152213bad4..c578771759 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -154,12 +154,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        labelHashSet::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, *this, iter)
     {
         if ((iter.key() < 0) || (iter.key() > map.size()))
         {
@@ -172,7 +167,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
                 << abort(FatalError);
         }
 
-        label newCellI = map[iter.key()];
+        const label newCellI = map[iter.key()];
 
         if (newCellI != iter.key())
         {
@@ -187,14 +182,9 @@ void topoSet::topoSet::updateLabels(const labelList& map)
     {
         labelHashSet newSet(2*size());
 
-        for
-        (
-            labelHashSet::const_iterator iter = begin();
-            iter != end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, *this, iter)
         {
-            label newCellI = map[iter.key()];
+            const label newCellI = map[iter.key()];
 
             if (newCellI >= 0)
             {
@@ -209,12 +199,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
 
 void topoSet::topoSet::check(const label maxLabel)
 {
-    for
-    (
-        topoSet::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(topoSet, *this, iter)
     {
         if ((iter.key() < 0) || (iter.key() > maxLabel))
         {
@@ -309,9 +294,7 @@ void topoSet::writeDebug
 
         writeDebug(os, coords, halfLen, iter, n);
 
-        os<< endl
-          << "  .." << endl
-          << endl;
+        os  << nl << "  .." << nl << endl;
 
         for (; n < size() - halfLen; ++n)
         {
@@ -505,12 +488,7 @@ void topoSet::subset(const topoSet& set)
     clear();
     resize(2*min(currentSet.size(), set.size()));
 
-    for
-    (
-        labelHashSet::const_iterator iter = currentSet.begin();
-        iter != currentSet.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, currentSet, iter)
     {
         if (set.found(iter.key()))
         {
@@ -523,12 +501,7 @@ void topoSet::subset(const topoSet& set)
 
 void topoSet::addSet(const topoSet& set)
 {
-    for
-    (
-        topoSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(topoSet, set, iter)
     {
         insert(iter.key());
     }
@@ -537,12 +510,7 @@ void topoSet::addSet(const topoSet& set)
 
 void topoSet::deleteSet(const topoSet& set)
 {
-    for
-    (
-        topoSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(topoSet, set, iter)
     {
         erase(iter.key());
     }
@@ -574,9 +542,7 @@ void topoSet::writeDebug(Ostream& os, const label maxLen) const
 
         writeDebug(os, halfLen, iter, n);
 
-        os<< endl
-          << "  .." << endl
-          << endl;
+        os  << nl << "  .." << nl << endl;
 
         for (; n < size() - halfLen; ++n)
         {
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index e247130ec6..ae286bd0db 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -121,12 +121,7 @@ License
 //    // Snap outside points to surface
 //    pointField newPoints(points);
 //
-//    for
-//    (
-//        labelHashSet::const_iterator iter = flatCandidates.begin();
-//        iter != flatCandidates.end();
-//        ++iter
-//    )
+//    forAllConstIter(labelHashSet, flatCandidates, iter)
 //    {
 //        const cell& cFaces = cells[iter.key()];
 //
@@ -152,12 +147,7 @@ License
 //
 //    // Calculate new volume for mixed cells
 //    label nRemoved = 0;
-//    for
-//    (
-//        labelHashSet::const_iterator iter = flatCandidates.begin();
-//        iter != flatCandidates.end();
-//        ++iter
-//    )
+//    forAllConstIter(labelHashSet, flatCandidates, iter)
 //    {
 //        label cellI = iter.key();
 //
@@ -404,15 +394,9 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
 
     labelHashSet mixedOnlyCells(internalCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = internalCells.begin();
-        iter != internalCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, internalCells, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const cell& cFaces = cells[cellI];
 
         label usesMixedOnly = true;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 83075081d0..faf68b30bd 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -255,15 +255,10 @@ Foam::edgeSurface::edgeSurface
     // Add intersection edges to faceEdges
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    for
-    (
-        labelPairLookup::const_iterator iter = inter.facePairToEdge().begin();
-        iter != inter.facePairToEdge().end();
-        ++iter
-    )
+    forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
     {
         // Edge label in intersection
-        label edgeI = iter();
+        const label edgeI = iter();
 
         // Get the face from the correct surface
         const FixedList<label, 2>& twoFaces = iter.key();
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index e06f8462c0..ed171db033 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -826,12 +826,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
         OFstream objStream("nearestSamples.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<label>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, nearest, iter)
         {
             meshTools::writeOBJ(objStream, samples[iter.key()]); vertI++;
             meshTools::writeOBJ(objStream, surfPoints[iter()]); vertI++;
@@ -957,14 +952,9 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
         OFstream objStream("nearestEdges.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<label>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, nearest, iter)
         {
-            label sampleI = iter.key();
+            const label sampleI = iter.key();
 
             meshTools::writeOBJ(objStream, samples[sampleI]); vertI++;
 
@@ -1119,14 +1109,9 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
         OFstream objStream("nearestEdges.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<pointIndexHit>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<pointIndexHit>, nearest, iter)
         {
-            label sampleEdgeI = iter.key();
+            const label sampleEdgeI = iter.key();
 
             const edge& sampleEdge = sampleEdges[sampleEdgeI];
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index d615a7453a..1fd9d14978 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2341,17 +2341,10 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
 
     label newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
-
         const pointField& points = patch.points();
 
         label nTriTotal = 0;
@@ -2402,19 +2395,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
 
     newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         surface.patches()[newPatchI].name() = patch.name();
-
         surface.patches()[newPatchI].geometricType() = patch.type();
 
         newPatchI++;
@@ -2460,15 +2446,9 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
 
     label newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         label nTriTotal = 0;
@@ -2518,19 +2498,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
 
     newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         surface.patches()[newPatchI].name() = patch.name();
-
         surface.patches()[newPatchI].geometricType() = patch.type();
 
         newPatchI++;
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index e8e7785fb0..916557e83d 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -56,7 +56,7 @@ void twoDPointCorrector::calcAddressing() const
     // Try and find a wedge patch
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         if (isA<wedgePolyPatch>(patches[patchI]))
         {
@@ -76,7 +76,7 @@ void twoDPointCorrector::calcAddressing() const
     // Try to find an empty patch with faces
     if (!isWedge)
     {
-        forAll (patches, patchI)
+        forAll(patches, patchI)
         {
             if (isA<emptyPolyPatch>(patches[patchI]) && patches[patchI].size())
             {
@@ -122,7 +122,7 @@ void twoDPointCorrector::calcAddressing() const
 
     label nNormalEdges = 0;
 
-    forAll (meshEdges, edgeI)
+    forAll(meshEdges, edgeI)
     {
         vector edgeVector =
             meshEdges[edgeI].vec(meshPoints)/
@@ -269,7 +269,7 @@ void twoDPointCorrector::correctPoints(pointField& p) const
     const labelList& neIndices = normalEdgeIndices();
     const vector& pn = planeNormal();
 
-    forAll (neIndices, edgeI)
+    forAll(neIndices, edgeI)
     {
         point& pStart = p[meshEdges[neIndices[edgeI]].start()];
 
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index c1c3603585..5523e079f9 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -46,7 +46,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -74,7 +74,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
     PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, fvPatchField, volMesh>& procField =
             procFields[procI];
@@ -244,7 +244,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -272,7 +272,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
     PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
             procFields[procI];
@@ -285,7 +285,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         {
             labelList curAddr(faceProcAddressing_[procI]);
 
-            forAll (curAddr, addrI)
+            forAll(curAddr, addrI)
             {
                 curAddr[addrI] -= 1;
             }
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
index fd6303c836..e9bc8bd927 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
@@ -63,7 +63,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
                     .meshPoints();
 
                 // Create the inverse-addressing of the patch point labels.
-                forAll (patchPointLabels, pointi)
+                forAll(patchPointLabels, pointi)
                 {
                     pointMap[patchPointLabels[pointi]] = pointi;
                 }
@@ -71,7 +71,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
                 const labelList& procPatchPoints =
                     procMesh.boundary()[patchi].meshPoints();
 
-                forAll (procPatchPoints, pointi)
+                forAll(procPatchPoints, pointi)
                 {
                     procPatchAddr[pointi] =
                         pointMap
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
index 5f67a7c48e..0d0e29913e 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
@@ -37,7 +37,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, proci)
+    forAll(procMeshes_, proci)
     {
         procFields.set
         (
@@ -65,7 +65,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
     PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, proci)
+    forAll(procMeshes_, proci)
     {
         const GeometricField<Type, pointPatchField, pointMesh>&
             procField = procFields[proci];
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index be03bf0ae7..5e9b27ff44 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -31,7 +31,7 @@ License
 
 void Foam::processorMeshes::read()
 {
-    forAll (databases_, procI)
+    forAll(databases_, procI)
     {
         meshes_.set
         (
@@ -144,7 +144,7 @@ Foam::fvMesh::readUpdateState Foam::processorMeshes::readUpdate()
 {
     fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
 
-    forAll (databases_, procI)
+    forAll(databases_, procI)
     {
         // Check if any new meshes need to be read.
         fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@@ -196,7 +196,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
     // Read the field for all the processors
     PtrList<pointIOField> procsPoints(meshes_.size());
 
-    forAll (meshes_, procI)
+    forAll(meshes_, procI)
     {
         procsPoints.set
         (
@@ -219,7 +219,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
     // Create the new points
     vectorField newPoints(mesh.nPoints());
 
-    forAll (meshes_, procI)
+    forAll(meshes_, procI)
     {
         const vectorField& procPoints = procsPoints[procI];
 
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index 687994868b..a68a88d457 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -111,7 +111,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
 Foam::graph Foam::noiseFFT::pt() const
 {
     scalarField t(size());
-    forAll (t, i)
+    forAll(t, i)
     {
         t[i] = i*deltat_;
     }
@@ -150,7 +150,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 
     label offset = ni*windowOffset;
 
-    forAll (pw, i)
+    forAll(pw, i)
     {
         pw[i] = operator[](i + offset);
     }
@@ -162,7 +162,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 Foam::tmp<Foam::scalarField> Foam::noiseFFT::Hanning(const label N) const
 {
     scalarField t(N);
-    forAll (t, i)
+    forAll(t, i)
     {
         t[i] = i*deltat_;
     }
@@ -238,7 +238,7 @@ Foam::graph Foam::noiseFFT::meanPf
     scalarField f(MeanPf.size());
     scalar deltaf = 1.0/(N*deltat_);
 
-    forAll (f, i)
+    forAll(f, i)
     {
         f[i] = i*deltaf;
     }
@@ -284,7 +284,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf
     scalarField f(RMSMeanPf.size());
     scalar deltaf = 1.0/(N*deltat_);
 
-    forAll (f, i)
+    forAll(f, i)
     {
         f[i] = i*deltaf;
     }
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 4f1a29ed82..cfdbc52681 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -71,12 +71,12 @@ void Foam::meshToMesh::calcAddressing()
     // set reference to boundary
     const polyPatchList& patchesFrom = fromMesh_.boundaryMesh();
 
-    forAll (patchesFrom, patchI)
+    forAll(patchesFrom, patchI)
     {
         // get reference to cells next to the boundary
         const unallocLabelList& bCells = patchesFrom[patchI].faceCells();
 
-        forAll (bCells, faceI)
+        forAll(bCells, faceI)
         {
             boundaryCell[bCells[faceI]] = true;
         }
@@ -126,7 +126,7 @@ void Foam::meshToMesh::calcAddressing()
         oc
     );
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         const polyPatch& toPatch = toMesh_.boundaryMesh()[patchi];
 
@@ -243,7 +243,7 @@ void Foam::meshToMesh::cellAddresses
     const vectorField& centresFrom = fromMesh.cellCentres();
     const labelListList& cc = fromMesh.cellCells();
 
-    forAll (points, toI)
+    forAll(points, toI)
     {
         // pick up target position
         const vector& p = points[toI];
@@ -260,7 +260,7 @@ void Foam::meshToMesh::cellAddresses
             // set the current list of neighbouring cells
             const labelList& neighbours = cc[curCell];
 
-            forAll (neighbours, nI)
+            forAll(neighbours, nI)
             {
                 scalar curDistSqr =
                     magSqr(p - centresFrom[neighbours[nI]]);
@@ -300,7 +300,7 @@ void Foam::meshToMesh::cellAddresses
                 // set the current list of neighbouring cells
                 const labelList& neighbours = cc[curCell];
 
-                forAll (neighbours, nI)
+                forAll(neighbours, nI)
                 {
                     // search through all the neighbours.
                     // If point is in neighbour reset current cell
@@ -319,12 +319,12 @@ void Foam::meshToMesh::cellAddresses
                     // set the current list of neighbouring cells
                     const labelList& neighbours = cc[curCell];
 
-                    forAll (neighbours, nI)
+                    forAll(neighbours, nI)
                     {
                         // set the current list of neighbour-neighbouring cells
                         const labelList& nn = cc[neighbours[nI]];
 
-                        forAll (nn, nI)
+                        forAll(nn, nI)
                         {
                             // search through all the neighbours.
                             // If point is in neighbour reset current cell
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index efbd09ad77..9a942408c0 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -50,7 +50,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
     const vectorField& centreFrom = fromMesh_.C().internalField();
     const vectorField& centreTo = toMesh_.C().internalField();
 
-    forAll (cellAddressing_, celli)
+    forAll(cellAddressing_, celli)
     {
         if (cellAddressing_[celli] != -1)
         {
@@ -81,7 +81,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
                 scalar sumInvDist = invDist;
 
                 // now add the neighbours
-                forAll (neighbours, ni)
+                forAll(neighbours, ni)
                 {
                     invDist = 1.0/mag(target - centreFrom[neighbours[ni]]);
                     invDistCoeffs[celli][ni + 1] = invDist;
@@ -89,7 +89,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
                 }
 
                 // divide by the total inverse-distance
-                forAll (invDistCoeffs[celli], i)
+                forAll(invDistCoeffs[celli], i)
                 {
                     invDistCoeffs[celli][i] /= sumInvDist;
                 }
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index 2b7a021bd2..e341fef90b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -50,7 +50,7 @@ Foam::meshToMesh::meshToMesh
     boundaryAddressing_(toMesh_.boundaryMesh().size()),
     inverseDistanceWeightsPtr_(NULL)
 {
-    forAll (fromMesh_.boundaryMesh(), patchi)
+    forAll(fromMesh_.boundaryMesh(), patchi)
     {
         fromMeshPatches_.insert
         (
@@ -59,7 +59,7 @@ Foam::meshToMesh::meshToMesh
         );
     }
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         toMeshPatches_.insert
         (
@@ -68,7 +68,7 @@ Foam::meshToMesh::meshToMesh
         );
     }
 
-    forAll (cuttingPatchNames, i)
+    forAll(cuttingPatchNames, i)
     {
         if (toMeshPatches_.found(cuttingPatchNames[i]))
         {
@@ -91,7 +91,7 @@ Foam::meshToMesh::meshToMesh
         }
     }
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         // Add the processor patches in the toMesh to the cuttingPatches list
         if (isA<processorPolyPatch>(toMesh_.boundaryMesh()[patchi]))
@@ -134,7 +134,7 @@ Foam::meshToMesh::meshToMesh
             << exit(FatalError);
     }
 
-    forAll (fromMesh_.boundaryMesh(), patchi)
+    forAll(fromMesh_.boundaryMesh(), patchi)
     {
         if
         (
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
index 796afdbc7c..bcaec6d0ff 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
@@ -67,7 +67,7 @@ void Foam::meshToMesh::interpolateField
     // get reference to cellCells
     const labelListList& cc = fromMesh_.cellCells();
 
-    forAll (toF, celli)
+    forAll(toF, celli)
     {
         if (adr[celli] != -1)
         {
@@ -97,7 +97,7 @@ void Foam::meshToMesh::interpolateField
     // Cell-Point interpolation
     interpolationCellPoint<Type> interpolator(fromVf);
 
-    forAll (toF, celli)
+    forAll(toF, celli)
     {
         if (adr[celli] != -1)
         {
@@ -206,7 +206,7 @@ void Foam::meshToMesh::interpolate
 {
     interpolateInternalField(toVf, fromVf, ord);
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         const fvPatch& toPatch = toMesh_.boundary()[patchi];
 
@@ -338,7 +338,7 @@ Foam::meshToMesh::interpolate
         boundaryAddressing_.size()
     );
 
-    forAll (boundaryAddressing_, patchI)
+    forAll(boundaryAddressing_, patchI)
     {
         patchFields.set
         (
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index f73d12199f..effd9cd635 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -253,7 +253,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
 
     Info<< "fvDOM : Allocated " << IRay_.size()
         << " rays with average orientation:" << nl;
-    forAll (IRay_, i)
+    forAll(IRay_, i)
     {
         Info<< '\t' << IRay_[i].I().name()
             << '\t' << IRay_[i].dAve() << nl;
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 8392069679..6edaa29c2c 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -1428,7 +1428,7 @@ bool finishReaction = false;
 
         bool found = false;
 
-        forAll (lrhs, i)
+        forAll(lrhs, i)
         {
             if (lrhs[i].index == currentSpecieIndex)
             {
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 7a33facf2f..29717a7554 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -111,7 +111,7 @@ Foam::scalar Foam::chemkinReader::molecularWeight
 {
     scalar molWt = 0.0;
 
-    forAll (specieComposition, i)
+    forAll(specieComposition, i)
     {
         label nAtoms = specieComposition[i].nAtoms;
         const word& elementName = specieComposition[i].elementName;
@@ -430,24 +430,24 @@ void Foam::chemkinReader::addReaction
 
     scalarList nAtoms(elementNames_.size(), 0.0);
 
-    forAll (lhs, i)
+    forAll(lhs, i)
     {
         const List<specieElement>& specieComposition =
             specieComposition_[speciesTable_[lhs[i].index]];
 
-        forAll (specieComposition, j)
+        forAll(specieComposition, j)
         {
             label elementi = elementIndices_[specieComposition[j].elementName];
             nAtoms[elementi] += lhs[i].stoichCoeff*specieComposition[j].nAtoms;
         }
     }
 
-    forAll (rhs, i)
+    forAll(rhs, i)
     {
         const List<specieElement>& specieComposition =
             specieComposition_[speciesTable_[rhs[i].index]];
 
-        forAll (specieComposition, j)
+        forAll(specieComposition, j)
         {
             label elementi = elementIndices_[specieComposition[j].elementName];
             nAtoms[elementi] -= rhs[i].stoichCoeff*specieComposition[j].nAtoms;
@@ -459,7 +459,7 @@ void Foam::chemkinReader::addReaction
     // for the change from mol/cm^3 to kmol/m^3 concentraction units
     const scalar concFactor = 0.001;
     scalar sumExp = 0.0;
-    forAll (lhs, i)
+    forAll(lhs, i)
     {
         sumExp += lhs[i].exponent;
     }
@@ -470,7 +470,7 @@ void Foam::chemkinReader::addReaction
     if (rType == nonEquilibriumReversible)
     {
         sumExp = 0.0;
-        forAll (rhs, i)
+        forAll(rhs, i)
         {
             sumExp += rhs[i].exponent;
         }
@@ -770,7 +770,7 @@ void Foam::chemkinReader::addReaction
     }
 
 
-    forAll (nAtoms, i)
+    forAll(nAtoms, i)
     {
         if (mag(nAtoms[i]) > SMALL)
         {
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 16fff678b7..617349840c 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -56,7 +56,7 @@ void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
         Yt += Y_[n];
     }
 
-    forAll (Y_, n)
+    forAll(Y_, n)
     {
         Y_[n] /= Yt;
     }
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 04a1b80139..1246fc4b36 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -116,7 +116,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
 {
     scalar M = 0.0;
-    forAll (*this, i)
+    forAll(*this, i)
     {
         M += operator[](i)*c[i];
     }
@@ -169,7 +169,7 @@ inline Foam::Ostream& Foam::operator<<
 
     os << token::BEGIN_LIST << valMaxCount;
 
-    forAll (tbes, i)
+    forAll(tbes, i)
     {
         if (notEqual(tbes[i], valMaxCount))
         {
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index ec00f0be73..ed2929088d 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -29,7 +29,7 @@ License
 
 void Foam::speciesTable::setIndices()
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         specieIndices_.insert(wordList::operator[](i), i);
     }
@@ -52,7 +52,7 @@ Foam::speciesTable::speciesTable(const label nSpecies, const char** specieNames)
 :
     wordList(nSpecies)
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         wordList::operator[](i) = specieNames[i];
     }
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 3afdab2157..08fecc77a0 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -89,7 +89,7 @@ void Foam::thermalPorousZone::addEnthalpySource
     scalarField hZone = thermo.h(scalarField(cells.size(), T_.value()), cells);
     scalar rate = 1e6;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         hDiag[cells[i]] += rate*V[cells[i]]*rho[cells[i]];
         hSource[cells[i]] += rate*V[cells[i]]*rho[cells[i]]*hZone[i];
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
index 04e29059e2..261abb18e9 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
@@ -41,7 +41,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         Udiag[cells[i]] +=
             V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -64,7 +64,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
         scalar isoDragCoeff = tr(dragCoeff);
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 3f5e8eab7c..ac416f50da 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -89,7 +89,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -110,7 +110,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -172,7 +172,7 @@ void Foam::linearValveFvMesh::makeSlidersDead()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable layering
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -194,7 +194,7 @@ void Foam::linearValveFvMesh::makeSlidersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable sliding interface
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -217,7 +217,7 @@ bool Foam::linearValveFvMesh::attached() const
 
     bool result = false;
 
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -228,7 +228,7 @@ bool Foam::linearValveFvMesh::attached() const
     }
 
     // Check thal all sliders are in sync (debug only)
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 61395460c9..9723dcb320 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -92,7 +92,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -113,7 +113,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -148,7 +148,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList lpf(layerPatch.size());
 
-    forAll (lpf, i)
+    forAll(lpf, i)
     {
         lpf[i] = layerPatch.start() + i;
     }
@@ -216,7 +216,7 @@ void Foam::linearValveLayersFvMesh::makeLayersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable layering
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
@@ -242,7 +242,7 @@ void Foam::linearValveLayersFvMesh::makeSlidersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable sliding interface
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
@@ -269,7 +269,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
 
     bool result = false;
 
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -280,7 +280,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
     }
 
     // Check thal all sliders are in sync (debug only)
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -327,7 +327,7 @@ Foam::tmp<Foam::pointField> Foam::linearValveLayersFvMesh::newPoints() const
         motionDict_.lookup("pistonVelocity")
     );
 
-    forAll (patchPoints, ppI)
+    forAll(patchPoints, ppI)
     {
         np[patchPoints[ppI]] += vel*time().deltaTValue();
     }
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index b0f515aaec..693e080bd6 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -89,7 +89,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -110,7 +110,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -220,16 +220,16 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& cellAddr =
         cellZones()[cellZones().findZoneID("movingCells")];
 
-    forAll (cellAddr, cellI)
+    forAll(cellAddr, cellI)
     {
         const cell& curCell = c[cellAddr[cellI]];
 
-        forAll (curCell, faceI)
+        forAll(curCell, faceI)
         {
             // Mark all the points as moving
             const face& curFace = f[curCell[faceI]];
 
-            forAll (curFace, pointI)
+            forAll(curFace, pointI)
             {
                 movingPointsMask[curFace[pointI]] = 1;
             }
@@ -245,11 +245,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& innerSliderAddr =
         faceZones()[faceZones().findZoneID(innerSliderZoneName)];
 
-    forAll (innerSliderAddr, faceI)
+    forAll(innerSliderAddr, faceI)
     {
         const face& curFace = f[innerSliderAddr[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             movingPointsMask[curFace[pointI]] = 1;
         }
@@ -264,11 +264,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& outerSliderAddr =
         faceZones()[faceZones().findZoneID(outerSliderZoneName)];
 
-    forAll (outerSliderAddr, faceI)
+    forAll(outerSliderAddr, faceI)
     {
         const face& curFace = f[outerSliderAddr[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             movingPointsMask[curFace[pointI]] = 0;
         }
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 87f106c59a..497c1ec805 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::scalarField> Foam::movingConeTopoFvMesh::vertexMarkup
     tmp<scalarField> tvertexMarkup(new scalarField(p.size()));
     scalarField& vertexMarkup = tvertexMarkup();
 
-    forAll (p, pI)
+    forAll(p, pI)
     {
         if (p[pI].x() < curLeft - SMALL)
         {
@@ -114,7 +114,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
     boolList flipZone2(fc.size(), false);
     label nZoneFaces2 = 0;
 
-    forAll (fc, faceI)
+    forAll(fc, faceI)
     {
         if
         (
diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
index c263a1994e..dd3d087f9c 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
@@ -173,12 +173,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
     }
     else
     {
-        for
-        (
-            HashTable<label>::const_iterator iter = groupToPatch.begin();
-            iter != groupToPatch.end();
-            ++iter
-        )
+        forAllConstIter(HashTable<label>, groupToPatch, iter)
         {
             patches[iter()] = geometricSurfacePatch
             (
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index a944f31be9..13af74375d 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -136,12 +136,7 @@ bool triSurface::readTRI(const fileName& TRIfileName)
     pointField rawPoints(STLpoints.size());
 
     label i = 0;
-    for
-    (
-        SLList<STLpoint>::iterator iter = STLpoints.begin();
-        iter != STLpoints.end();
-        ++iter
-    )
+    forAllIter(SLList<STLpoint>, STLpoints, iter)
     {
         rawPoints[i++] = *iter;
     }
@@ -150,7 +145,7 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 
     label pointI = 0;
     SLList<label>::iterator iter = STLlabels.begin();
-    forAll (*this, i)
+    forAll(*this, i)
     {
         operator[](i)[0] = pointI++;
         operator[](i)[1] = pointI++;