diff --git a/applications/test/DLList/DLListTest.C b/applications/test/DLList/DLListTest.C
index 92db3b6651..4000dc90a1 100644
--- a/applications/test/DLList/DLListTest.C
+++ b/applications/test/DLList/DLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(DLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -64,12 +59,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using the same STL iterator: " << nl << endl;
 
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(DLList<scalar>, myList, iter)
     {
         Info<< "Removing " << myList.remove(iter) << endl;
     }
@@ -82,12 +72,7 @@ int main(int argc, char *argv[])
 
     const DLList<scalar>& const_myList = myList;
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -95,12 +80,7 @@ int main(int argc, char *argv[])
     myList.swapUp(myList.DLListBase::first());
     myList.swapUp(myList.DLListBase::last());
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -108,19 +88,14 @@ int main(int argc, char *argv[])
     myList.swapDown(myList.DLListBase::first());
     myList.swapDown(myList.DLListBase::last());
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
 
 
-    Info<< nl << "Testing transfer: " << nl << endl;
-    Info<< "original: " << myList << endl;
+    Info<< nl << "Testing transfer: " << nl << nl
+        << "original: " << myList << endl;
 
     DLList<scalar> newList;
     newList.transfer(myList);
diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C
index 138c185f4a..2844489f72 100644
--- a/applications/test/Dictionary/DictionaryTest.C
+++ b/applications/test/Dictionary/DictionaryTest.C
@@ -114,12 +114,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    for
-    (
-        Dictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
+    forAllConstIter(Dictionary<ent>, dict, iter)
     {
         Info<< "element : " << *iter;
     }
@@ -159,12 +154,7 @@ int main(int argc, char *argv[])
     }
 
     Info<< nl << "scalarDict1: " << endl;
-    for
-    (
-        PtrDictionary<Scalar>::const_iterator iter = scalarDict.begin();
-        iter != scalarDict.end();
-        ++iter
-    )
+    forAllConstIter(PtrDictionary<Scalar>, scalarDict, iter)
     {
         Info<< " = " << iter() << endl;
     }
@@ -176,12 +166,7 @@ int main(int argc, char *argv[])
         scalarDict2.insert(key, new Scalar(1.3*i));
     }
     Info<< nl << "scalarDict2: " << endl;
-    for
-    (
-        PtrDictionary<Scalar>::const_iterator iter = scalarDict2.begin();
-        iter != scalarDict2.end();
-        ++iter
-    )
+    forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
     {
         Info<< "elem = " << *iter << endl;
     }
diff --git a/applications/test/ISLList/ISLListTest.C b/applications/test/ISLList/ISLListTest.C
index bd390f38d3..1991aa4f24 100644
--- a/applications/test/ISLList/ISLListTest.C
+++ b/applications/test/ISLList/ISLListTest.C
@@ -78,12 +78,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -92,14 +87,9 @@ int main(int argc, char *argv[])
 
     const ISLList<Scalar>& const_myList = myList;
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
 
diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/PackedListTest2.C
index 5a04ece832..362e5cd8d0 100644
--- a/applications/test/PackedList2/PackedListTest2.C
+++ b/applications/test/PackedList2/PackedListTest2.C
@@ -188,12 +188,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::iterator it = packed.begin();
-            it != packed.end();
-            ++it
-        )
+        forAllIter(PackedBoolList, packed, it)
         {
             sum += it;
         }
@@ -207,12 +202,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::const_iterator cit = packed.cbegin();
-            cit != packed.cend();
-            ++cit
-        )
+        forAllConstIter(PackedBoolList, packed, cit)
         {
             sum += cit();
         }
@@ -333,12 +323,7 @@ int main(int argc, char *argv[])
     // Write packed
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::iterator it = packed.begin();
-            it != packed.end();
-            ++it
-        )
+        forAllIter(PackedBoolList, packed, it)
         {
             it() = 1;
         }
diff --git a/applications/test/SLList/SLListTest.C b/applications/test/SLList/SLListTest.C
index 3d40182df3..9a9e81c21f 100644
--- a/applications/test/SLList/SLListTest.C
+++ b/applications/test/SLList/SLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -65,39 +60,23 @@ int main(int argc, char *argv[])
 
     const SLList<scalar>& const_myList = myList;
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "Removing element:" << *iter << endl;
         myList.remove(iter);
     }
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
 
-
     for (int i = 0; i<10; i++)
     {
         myList.append(1.3*i);
diff --git a/applications/test/UDictionary/UDictionaryTest.C b/applications/test/UDictionary/UDictionaryTest.C
index 13571ffab4..57fc55c0b3 100644
--- a/applications/test/UDictionary/UDictionaryTest.C
+++ b/applications/test/UDictionary/UDictionaryTest.C
@@ -81,12 +81,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    for
-    (
-        UDictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
+    forAllConstIter(UDictionary<ent>, dict, iter)
     {
         Info<< "element : " << *iter;
     }
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 7fd22cf88a..6c50c02fcd 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -441,12 +441,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
     {
         pFaces[CYCLIC].setSize(1);
         pFaces[CYCLIC][0] = pFaces[WEDGE][0];
-        for
-        (
-            SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
-            iterb != pFaces[WEDGE][1].end();
-            ++iterb
-        )
+        forAllIter(SLList<face>, pFaces[WEDGE][1], iterb)
         {
             pFaces[CYCLIC][0].append(iterb());
         }
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index 5496835381..dfcfb91471 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -143,12 +143,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -183,12 +178,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -209,12 +199,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -1461,7 +1446,7 @@ int main(int argc, char *argv[])
 
         mesh.setInstance(meshInstance);
     }
-    
+
 
 
     // Change master and slave boundary conditions on originating mesh
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 7da3c22269..1bac3a554b 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -99,12 +99,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -139,12 +134,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -165,12 +155,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 1a9bff5429..d7487dc58e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -506,7 +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.
-            forAllIter(SLList<label>, curProcFaces, curProcFacesIter)
+            forAllConstIter(SLList<label>, curProcFaces, curProcFacesIter)
             {
                 curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
                 nFaces++;
@@ -559,7 +559,7 @@ void Foam::domainDecomposition::decomposeMesh()
 
                 // add faces for this processor boundary
 
-                forAllIter
+                forAllConstIter
                 (
                     SLList<label>,
                     curInterProcBFacesIter(),
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index fa0510765b..010bb3758a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -55,7 +55,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
         {
             SLList<indexedParticle*>& particlePtrs = *cellParticles[celli];
 
-            forAllIter(SLList<indexedParticle*>, particlePtrs, iter)
+            forAllConstIter(SLList<indexedParticle*>, particlePtrs, iter)
             {
                 const indexedParticle& ppi = *iter();
                 particleIndices_[pi++] = ppi.index();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
index c9c07fc368..6f66553f18 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
@@ -50,7 +50,7 @@ void readFields
     label nFields = fields.size();
     fields.setSize(nFields + fieldObjects.size());
 
-    forAllIter(IOobjectList::iterator, fieldObjects, iter)
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 6e463f8b3b..e2a054dcb1 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -502,7 +502,7 @@ Foam::wordList Foam::dictionary::toc() const
     wordList keys(size());
 
     label nKeys = 0;
-    forAllConstIter(IDLList<entry>::const_iterator, *this, iter)
+    forAllConstIter(IDLList<entry>, *this, iter)
     {
         keys[nKeys++] = iter().keyword();
     }
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
index 2cc16bbec8..90cf9e5b0e 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
@@ -54,7 +54,7 @@ Foam::dlLibraryTable::readDlLibrary::readDlLibrary
 
 Foam::dlLibraryTable::~dlLibraryTable()
 {
-    forAllIter(dlLibraryTable, *this, iter)
+    forAllConstIter(dlLibraryTable, *this, iter)
     {
         dlclose(iter.key());
     }
diff --git a/src/OpenFOAM/fields/cloud/mapClouds.H b/src/OpenFOAM/fields/cloud/mapClouds.H
index b52d15d540..898fbbdf0f 100644
--- a/src/OpenFOAM/fields/cloud/mapClouds.H
+++ b/src/OpenFOAM/fields/cloud/mapClouds.H
@@ -49,12 +49,7 @@ inline void mapClouds(const objectRegistry& db, const mapPolyMesh& mapper)
 {
     HashTable<const cloud*> clouds(db.lookupClass<cloud>());
 
-    for
-    (
-        HashTable<const cloud*>::iterator iter = clouds.begin();
-        iter != clouds.end();
-        ++iter
-    )
+    forAllIter(HashTable<const cloud*>, clouds, iter)
     {
         cloud& c = const_cast<cloud&>(*iter());
 
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 4ec2acfef2..fa55f71e72 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -163,7 +163,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = contents[masterI];
 
-            forAllIter(SLList<label>, faceFacesIter(), facesIter)
+            forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
             {
                 faceRestrictAddressing_[facesIter()] = nCoarseFaces;
             }
@@ -192,7 +192,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = nbrsIter();
 
-            forAllIter(SLList<label>, faceFacesIter(), facesIter)
+            forAllConstIter(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 d56e24763f..1d79ac018e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -180,7 +180,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = contents[masterI];
 
-                forAllIter(SLList<label>, faceFacesIter(), facesIter)
+                forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
@@ -213,7 +213,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = nbrsIter();
 
-                forAllIter(SLList<label>, faceFacesIter(), facesIter)
+                forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 7edd22308c..270be1dd77 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -1411,7 +1411,7 @@ void Foam::globalPoints::calculateSharedPoints
 
     // Sort procPoints in incremental order. This will make the master the
     // first element.
-    forAllIter(Map<label>, meshToProcPoint_, iter)
+    forAllConstIter(Map<label>, meshToProcPoint_, iter)
     {
         sort(procPoints_[iter()]);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 18f5402428..b0ecac822b 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -371,9 +371,9 @@ Foam::mapDistribute::mapDistribute
             label i = 0;
             forAllIter(Map<label>, compactMap[procI], iter)
             {
+                const label compactI = compactStart[procI] + iter();
                 remoteElem[i] = iter.key();
-                label compactI = compactStart[procI]+iter();
-                localElem[i] = compactI;
+                localElem[i]  = compactI;
                 iter() = compactI;
                 i++;
             }
@@ -525,9 +525,9 @@ Foam::mapDistribute::mapDistribute
             label i = 0;
             forAllIter(Map<label>, compactMap[procI], iter)
             {
+                const label compactI = compactStart[procI] + iter();
                 remoteElem[i] = iter.key();
-                label compactI = compactStart[procI]+iter();
-                localElem[i] = compactI;
+                localElem[i]  = compactI;
                 iter() = compactI;
                 i++;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 16a0ef72bf..3591eac756 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -201,12 +201,7 @@ void Foam::syncTools::syncPointMap
 
                 // Only update those values which come from neighbour
 
-                forAllConstIter
-                (
-                    typename Map<T>,
-                    nbrPatchInfo,
-                    nbrIter
-                )
+                forAllConstIter(typename Map<T>, nbrPatchInfo, nbrIter)
                 {
                     combine
                     (
@@ -550,12 +545,7 @@ void Foam::syncTools::syncEdgeMap
 
                 // Only update those values which come from neighbour
 
-                forAllConstIter
-                (
-                    typename EdgeMap<T>,
-                    nbrPatchInfo,
-                    nbrIter
-                )
+                forAllConstIter(typename EdgeMap<T>, nbrPatchInfo, nbrIter)
                 {
                     const edge& e = nbrIter.key();
                     const edge meshEdge(meshPts[e[0]], meshPts[e[1]]);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index b87a462e0f..5f9805ef54 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -80,12 +80,14 @@ calcPointEdges() const
 
     forAll(pointEdges, pointI)
     {
-        pe[pointI].setSize(pointEdges[pointI].size());
+        const SLList<label>& pEdge = pointEdges[pointI];
+
+        pe[pointI].setSize(pEdge.size());
 
         label i = 0;
-        forAllIter(SLList<label>, pointEdges[pointI], curEdgesIter)
+        forAllConstIter(SLList<label>, pEdge, iter)
         {
-            pe[pointI][i++] = curEdgesIter();
+            pe[pointI][i++] = iter();
         }
     }
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index ab429fb926..588dda7566 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -35,12 +35,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -68,12 +63,7 @@ void Foam::fvMeshDistribute::addPatchFields(const word& patchFieldType)
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -108,12 +98,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatchFields()
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -147,12 +132,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
 
     label i = 0;
 
-    for
-    (
-        typename HashTable<const fldType*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const fldType*>, flds, iter)
     {
         const fldType& fld = *iter();
 
@@ -189,12 +169,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
 
     label fieldI = 0;
 
-    for
-    (
-        typename HashTable<const fldType*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const fldType*>, flds, iter)
     {
         const fldType& fld = *iter();
         typename fldType::GeometricBoundaryField& bfld =
@@ -245,12 +220,7 @@ void Foam::fvMeshDistribute::initPatchFields
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 37e4b18b66..5dc59ad815 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -36,12 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
+defineTypeNameAndDebug(Foam::combineFaces, 0);
 
-defineTypeNameAndDebug(combineFaces, 0);
-
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
index 9bfbc6f509..9ab84988e3 100644
--- a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
+++ b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
@@ -46,12 +46,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
     HashTable<const Type*> memSets =
         morphMap.mesh().objectRegistry::lookupClass<Type>();
 
-    for
-    (
-        typename HashTable<const Type*>::iterator iter = memSets.begin();
-        iter != memSets.end();
-        ++iter
-    )
+    forAllIter(typename HashTable<const Type*>, memSets, iter)
     {
         Type& set = const_cast<Type&>(*iter());
 
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 6ede6f3cf2..aeddeb7ddd 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -461,7 +461,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         iter
     )
     {
-        scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+        scalarFields_.insert
+        (
+            iter.key(),
+            new scalarField(*iter(), mapper)
+        );
     }
 
     forAllConstIter
@@ -471,7 +475,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         iter
     )
     {
-        vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+        vectorFields_.insert
+        (
+            iter.key(),
+            new vectorField(*iter(), mapper)
+        );
     }
 
     forAllConstIter
@@ -509,7 +517,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         iter
     )
     {
-        tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+        tensorFields_.insert
+        (
+            iter.key(),
+            new tensorField(*iter(), mapper)
+        );
     }
 }
 
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 72da883707..ce09fbef75 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -352,14 +352,32 @@ genericPointPatchField<Type>::genericPointPatchField
     actualTypeName_(ptf.actualTypeName_),
     dict_(ptf.dict_)
 {
-    forAllConstIter(HashPtrTable<scalarField>, ptf.scalarFields_, iter)
+    forAllConstIter
+    (
+        HashPtrTable<scalarField>,
+        ptf.scalarFields_,
+        iter
+    )
     {
-        scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+        scalarFields_.insert
+        (
+            iter.key(),
+            new scalarField(*iter(), mapper)
+        );
     }
 
-    forAllConstIter(HashPtrTable<vectorField>, ptf.vectorFields_, iter)
+    forAllConstIter
+    (
+        HashPtrTable<vectorField>,
+        ptf.vectorFields_,
+        iter
+    )
     {
-        vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+        vectorFields_.insert
+        (
+            iter.key(),
+            new vectorField(*iter(), mapper)
+        );
     }
 
     forAllConstIter
@@ -397,7 +415,11 @@ genericPointPatchField<Type>::genericPointPatchField
         iter
     )
     {
-        tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+        tensorFields_.insert
+        (
+            iter.key(),
+            new tensorField(*iter(), mapper)
+        );
     }
 }
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 3c31c1f807..ef43828c4c 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -227,12 +227,7 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
                     typename ParticleType::iNew(*this)
                 );
 
-                forAllIter
-                (
-                    typename Cloud<ParticleType>,
-                    newParticles,
-                    newpIter
-                )
+                forAllIter(typename Cloud<ParticleType>, newParticles, newpIter)
                 {
                     ParticleType& newp = newpIter();
                     newp.correctAfterParallelTransfer(patchi, td);
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 3449fd2612..7a7b026099 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -33,12 +33,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void spray::evolve()
+void Foam::spray::evolve()
 {
     sms_.setSize(rho_.size());
     shs_.setSize(rho_.size());
@@ -71,7 +66,7 @@ void spray::evolve()
 }
 
 
-void spray::move()
+void Foam::spray::move()
 {
     // Reset Spray Source Terms
     sms_ = vector::zero;
@@ -85,9 +80,9 @@ void spray::move()
 }
 
 
-void spray::breakupLoop()
+void Foam::spray::breakupLoop()
 {
-    forAllIter(spray::iterator, *this, elmnt)
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
@@ -119,9 +114,9 @@ void spray::breakupLoop()
 }
 
 
-void spray::atomizationLoop()
+void Foam::spray::atomizationLoop()
 {
-    forAllIter(spray::iterator, *this, elmnt)
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
@@ -145,8 +140,4 @@ void spray::atomizationLoop()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index c835ba5048..9a7be0be73 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -29,8 +29,7 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 
     label uV = 0;
 
-    // or forAllConstIter
-    forAllIter(IDLList<molecule>, molecules, mol)
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
         uVals[uV++] = mol().U();
     }
@@ -42,8 +41,7 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 {
     vector p = vector::zero;
 
-    // or forAllConstIter
-    forAllIter(IDLList<molecule>, molecules, mol)
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
         p.x() +=
             mol().mass() * mol().U().y() * mol().U().z()
@@ -65,8 +63,7 @@ if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
 {
     vector s = vector::zero;
 
-    // or forAllConstIter
-    forAllIter(IDLList<molecule>, molecules, mol)
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
         s +=
         (
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 97bfab9dce..05569f0448 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -54,14 +54,9 @@ label singleStepNMols = molecules.size();
 label singleStepDOFs = 0;
 
 {
-    for
-    (
-        IDLList<molecule>::iterator mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
-        label molId = mol().id();
+        const label molId = mol().id();
 
         scalar molMass(molecules.constProps(molId).mass());
 
@@ -75,14 +70,9 @@ label singleStepDOFs = 0;
     //     singleStepCentreOfMass /= singleStepTotalMass;
     // }
 
-    for
-    (
-        IDLList<molecule>::iterator mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
-        label molId = mol().id();
+        const label molId = mol().id();
 
         const molecule::constantProperties cP(molecules.constProps(molId));
 
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 5eedc280b0..201a7020ea 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -72,7 +72,7 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
     c.checkFieldIOobject(c, U);
 
     label i = 0;
-    forAllIter(Cloud<solidParticle>::iterator, c, iter)
+    forAllIter(Cloud<solidParticle>, c, iter)
     {
         solidParticle& p = iter();
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index 6eb0d60a3f..a73b502a9c 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -125,12 +125,7 @@ void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -165,12 +160,7 @@ void meshRefinement::reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index 85b8b4c9b0..8a1a18a051 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -150,9 +150,9 @@ void Foam::normalToFace::applyToSet
 
         DynamicList<label> toBeRemoved(set.size()/10);
 
-        forAllIter(topoSet, set, iter)
+        forAllConstIter(topoSet, set, iter)
         {
-            label faceI = iter.key();
+            const label faceI = iter.key();
 
             vector n = mesh_.faceAreas()[faceI];
             n /= mag(n) + VSMALL;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 53fd83a0d7..7ae4cffe8c 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -329,12 +329,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
     }
 
     // Shrink it
-    for
-    (
-        Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
-        iter != facePointEdges.end();
-        ++iter
-    )
+    forAllIter(Map< DynamicList<label> >, facePointEdges, iter)
     {
         iter().shrink();
 
@@ -358,17 +353,13 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         {
             label edgeI = fEdges[i];
             const edge& e = edges[edgeI];
-            Pout<< "    " << edgeI << ' ' << e << points[e.start()]
+            Pout<< "    " << edgeI << ' ' << e
+                << points[e.start()]
                 << points[e.end()] << endl;
         }
 
         Pout<< "    Constructed point-edge adressing:" << endl;
-        for
-        (
-            Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
-            iter != facePointEdges.end();
-            ++iter
-        )
+        forAllConstIter(Map< DynamicList<label> >, facePointEdges, iter)
         {
             Pout<< "    vertex " << iter.key() << " is connected to edges "
                 << iter() << endl;
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index a2cf670b2b..70ac1ee3ed 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -96,7 +96,7 @@ void Foam::reconstructLagrangianFields
     const IOobjectList& objects
 )
 {
-    word fieldClassName(IOField<Type>::typeName);
+    const word fieldClassName(IOField<Type>::typeName);
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
@@ -105,7 +105,7 @@ void Foam::reconstructLagrangianFields
         Info<< "    Reconstructing lagrangian "
             << fieldClassName << "s\n" << endl;
 
-        forAllIter(IOobjectList, fields, fieldIter)
+        forAllConstIter(IOobjectList, fields, fieldIter)
         {
             Info<< "        " << fieldIter()->name() << endl;
             reconstructLagrangianField<Type>
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
index 726c209ee3..683a976b15 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
@@ -52,7 +52,7 @@ void Foam::reconstructLagrangianPositions
 
         Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
 
-        forAllIter(Cloud<passiveParticle>, lpi, iter)
+        forAllConstIter(Cloud<passiveParticle>, lpi, iter)
         {
             const passiveParticle& ppi = iter();
 
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index 13af74375d..ebb1cffe9d 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -37,14 +37,9 @@ Description
 #include "readHexLabel.H"
 #include "stringList.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool triSurface::readTRI(const fileName& TRIfileName)
+bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 {
     IFstream TRIfile(TRIfileName);
 
@@ -113,12 +108,12 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 
         label region  = -1;
 
-        HashTable<label, string>::const_iterator findName =
+        HashTable<label, string>::const_iterator fnd =
             STLsolidNames.find(solidName);
 
-        if (findName != STLsolidNames.end())
+        if (fnd != STLsolidNames.end())
         {
-            region = findName();
+            region = fnd();
         }
         else
         {
@@ -135,16 +130,16 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 
     pointField rawPoints(STLpoints.size());
 
-    label i = 0;
-    forAllIter(SLList<STLpoint>, STLpoints, iter)
+    label pointI = 0;
+    forAllConstIter(SLList<STLpoint>, STLpoints, iter)
     {
-        rawPoints[i++] = *iter;
+        rawPoints[pointI++] = *iter;
     }
 
     setSize(STLlabels.size());
 
-    label pointI = 0;
-    SLList<label>::iterator iter = STLlabels.begin();
+    pointI = 0;
+    SLList<label>::const_iterator iter = STLlabels.begin();
     forAll(*this, i)
     {
         operator[](i)[0] = pointI++;
@@ -171,8 +166,4 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //