diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 78ac403e99..7573b8f537 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -26,7 +26,7 @@ Application
     PDRFoam
 
 Description
-    Compressible premixed/partially-premixed combustion solver with turbulence 
+    Compressible premixed/partially-premixed combustion solver with turbulence
     modelling.
 
     Combusting RANS code using the b-Xi two-equation model.
@@ -121,7 +121,8 @@ scalar StCoNum = 0.0;
             // Test : disable refinement for some cells
             PackedList<1>& protectedCell =
                 refCast<dynamicRefineFvMesh>(mesh).protectedCell();
-            if (protectedCell.size() == 0)
+
+            if (protectedCell.empty())
             {
                 protectedCell.setSize(mesh.nCells());
                 protectedCell = 0;
@@ -135,7 +136,7 @@ scalar StCoNum = 0.0;
                 }
             }
 
-            //volScalarField pIndicator("pIndicator", 
+            //volScalarField pIndicator("pIndicator",
             //    p*(fvc::laplacian(p))
             //  / (
             //        magSqr(fvc::grad(p))
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index 02a8214cb2..8fdf1f8c70 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -26,7 +26,8 @@ Class
     Foam::PDRDragModel
 
 Description
-    Base-class for sub-grid obstacle drag models.
+    Base-class for sub-grid obstacle drag models. The available drag model is at
+    \link basic.H \endlink.
 
 SourceFiles
     PDRDragModel.C
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
index d3044dec21..727cdd9f4c 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@@ -70,7 +70,7 @@ Description
         \f$ T \f$ is a tensor in the file CT.
 
     The term \f$ G_{R} \f$ is treated explicitly in the \f$ \kappa-\epsilon
-    \f$ Eqs in the PDRkEpsilon.C file.
+    \f$ Eqs in the \link PDRkEpsilon.C \endlink file.
 
 
 SourceFiles
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 5adde282fa..eaaafc99d4 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    const basicThermo& thermophysicalModel
+    basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index db2bc94c45..0866a28a8e 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -27,7 +27,7 @@ Class
 
 Description
     Standard k-epsilon turbulence model with additional source terms
-    corresponding to PDR basic drag model (basic.H)
+    corresponding to PDR basic drag model (\link basic.H \endlink)
 
     The turbulence source term \f$ G_{R} \f$ appears in the
     \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to
@@ -93,7 +93,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const basicThermo& thermophysicalModel
+            basicThermo& thermophysicalModel
         );
 
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
index 50595ff026..b7285f92c0 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@@ -26,6 +26,10 @@ Class
     Foam::XiEqModels::SCOPEBlend
 
 Description
+    Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation
+    with a linear correction function to give a plausible profile for XiEq.
+    See @link SCOPELaminarFlameSpeed.H @endlink for details on the SCOPE
+    laminar flame speed model.
 
 SourceFiles
     SCOPEBlend.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
index ce756ce016..91d3a0f519 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@@ -28,6 +28,8 @@ Class
 Description
     Simple SCOPEXiEq model for XiEq based on SCOPEXiEqs correlation
     with a linear correction function to give a plausible profile for XiEq.
+    See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE laminar
+    flame speed model.
 
 SourceFiles
     SCOPEXiEq.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index 30f548d91c..f7f9c798e5 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -27,6 +27,12 @@ Class
 
 Description
     Base-class for all XiEq models used by the b-XiEq combustion model.
+    The available models are :
+                                \link basicXiSubXiEq.H \endlink
+                                \link Gulder.H \endlink
+                                \link instabilityXiEq.H \endlink
+                                \link SCOPEBlendXiEq.H \endlink
+                                \link SCOPEXiEq.H \endlink
 
 SourceFiles
     XiEqModel.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
index 11c1bc36b2..ddc38bef30 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@@ -26,6 +26,9 @@ Class
     Foam::XiEqModels::instability
 
 Description
+    This is the equilibrium level of the flame wrinkling generated by
+    instability. It is a constant (default 2.5). It is used in
+    @link XiModel.H @endlink.
 
 SourceFiles
     instability.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
index 95028a4d9f..2ca885d567 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@@ -26,7 +26,8 @@ Class
     Foam::XiGModels::KTS
 
 Description
-    Simple Kolmogorov time-scale model for the flame-wrinling generation rate.
+    Simple Kolmogorov time-scale (KTS) model for the flame-wrinling generation
+    rate.
 
 SourceFiles
     KTS.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 953297d8e6..4e6ee553bb 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -27,6 +27,9 @@ Class
 
 Description
     Base-class for all Xi generation models used by the b-Xi combustion model.
+    See Technical Report SH/RE/01R for details on the PDR modelling. For details
+    on the use of XiGModel see \link XiModel.H \endlink. The model available is
+    \link instabilityG.H \endlink
 
 SourceFiles
     XiGModel.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
index ac63d1833d..ab01b3a8e0 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@@ -26,7 +26,10 @@ Class
     Foam::XiGModels::instabilityG
 
 Description
-    Flame-surface instabilityG flame-wrinking generation rate coefficient model.
+    Flame-surface instabilityG flame-wrinking generation rate coefficient model
+    used in \link XiModel.H \endlink.
+
+    See Technical Report SH/RE/01R for details on the PDR modelling.
 
 SourceFiles
     instabilityG.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index 93229e4de3..f44d1d5308 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -29,8 +29,10 @@ Description
     Base-class for all Xi models used by the b-Xi combustion model.
     See Technical Report SH/RE/01R for details on the PDR modelling.
 
-    Xi is given through an algebraic expression (algebraic.H),
-    by solving a transport equation (transport.H) or a fixed value (fixed.H).
+    Xi is given through an algebraic expression (\link algebraic.H \endlink),
+    by solving a transport equation (\link transport.H \endlink) or a
+    fixed value (\link fixed.H \endlink).
+
     See report TR/HGW/10 for details on the Weller two equations model.
 
     In the algebraic and transport methods \f$\Xi_{eq}\f$ is calculated in
@@ -45,6 +47,8 @@ Description
 
         \f$ \dwea{b} \f$ is the regress variable.
 
+        \f$ \Xi_{coeff} \f$ is a model constant.
+
         \f$ \Xi^* \f$ is the total equilibrium wrinkling combining the effects
         of the flame inestability and turbulence interaction and is given by
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
index 524bd582ec..fdb2fc20b9 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@@ -28,6 +28,8 @@ Class
 Description
     Simple algebraic model for Xi based on Gulders correlation
     with a linear correction function to give a plausible profile for Xi.
+    See report TR/HGW/10 for details on the Weller two equations model.
+    See \link XiModel.H \endlink for more details on flame wrinkling modelling.
 
 SourceFiles
     algebraic.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
index 940c4b55fa..968ed87d04 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@@ -26,7 +26,8 @@ Class
     Foam::XiModels::fixed
 
 Description
-    Fixed value model for Xi.
+    Fixed value model for Xi. See \link XiModel.H \endlink for more details
+    on flame wrinkling modelling.
 
 SourceFiles
     fixed.C
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index d1e4e90cf1..71db2b7e57 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -28,6 +28,8 @@ Class
 Description
     Simple transport model for Xi based on Gulders correlation
     with a linear correction function to give a plausible profile for Xi.
+    See report TR/HGW/10 for details on the Weller two equations model.
+    See \link XiModel.H \endlink for more details on flame wrinkling modelling.
 
 SourceFiles
     transport.C
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 8491d37ff7..01b349e9fa 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -100,7 +100,19 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-                    pEqn.solve();
+
+                    if
+                    (
+                        corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
+                    )
+                    {
+                        pEqn.solve(mesh.solver("pFinal"));
+                    }
+                    else
+                    {
+                        pEqn.solve();
+                    }
 
                     if (nonOrth == nNonOrthCorr)
                     {
diff --git a/applications/test/HashSet/hashSetTest.C b/applications/test/HashSet/hashSetTest.C
index a3527f7dd7..9625b2e0dc 100644
--- a/applications/test/HashSet/hashSetTest.C
+++ b/applications/test/HashSet/hashSetTest.C
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
     wordHashSet setA(0);
     HashTable<label, word> tableA;
 
-    HashTable<empty> tableB;
+    HashTable<nil> tableB;
     Map<label> mapA;
 
     setA.insert("kjhk");
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
     tableA.insert("value2", 2);
     tableA.insert("value3", 3);
 
-    tableB.insert("value4", empty());
-    tableB.insert("value5", empty());
-    tableB.insert("value6", empty());
+    tableB.insert("value4", nil());
+    tableB.insert("value5", nil());
+    tableB.insert("value6", nil());
 
     mapA.set(1, 1);
     mapA.set(2, 2);
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     Info<< wordHashSet(setA) << endl;
     Info<< "create from HashTable<T>: ";
     Info<< wordHashSet(tableA) << endl;
-    Info<< "create from HashTable<empty>: ";
+    Info<< "create from HashTable<nil>: ";
     Info<< wordHashSet(tableB) << endl;
 
     Info<< "create from Map<label>: ";
diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C
index 633c0e1ba4..8e3db2c9d7 100644
--- a/applications/test/HashTable/hashTableTest.C
+++ b/applications/test/HashTable/hashTableTest.C
@@ -100,12 +100,12 @@ int main()
         << "\ntable2" << table1 << nl
         << "\ntable3" << table3 << nl;
 
-    Info<< "\ndelete table2" << nl;
+    Info<< "\nerase table2 by iterator" << nl;
     forAllIter(HASHTABLE_CLASS<double>, table2, iter)
     {
-        Info<< "deleting " << iter.key() << " => " << iter() << " ... ";
+        Info<< "erasing " << iter.key() << " => " << iter() << " ... ";
         table2.erase(iter);
-        Info<< "deleted" << endl;
+        Info<< "erased" << endl;
     }
 
     Info<< "\ntable1" << table1 << nl
@@ -134,6 +134,24 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
+    
+    // insert a few things into table2
+    table2.set("ada", 14.0);
+    table2.set("aeq", 15.0);
+    table2.set("aaw", 16.0);
+    table2.set("abs", 17.0);
+    table2.set("adx", 20.0);
+    
+    Info<< "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
+    label nErased = table1.erase(table2);
+    
+    Info<< "\nerase table2 keys from table1 (removed "
+        << nErased << " elements)" << nl
+        << "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
 
     Info<< "\nclearStorage table3 ... ";
     table3.clearStorage();
diff --git a/applications/test/StaticHashTable/staticHashTableTest.C b/applications/test/StaticHashTable/staticHashTableTest.C
index da879d4d5e..2060ec582c 100644
--- a/applications/test/StaticHashTable/staticHashTableTest.C
+++ b/applications/test/StaticHashTable/staticHashTableTest.C
@@ -100,13 +100,13 @@ int main()
         << "\ntable2" << table1 << nl
         << "\ntable3" << table3 << nl;
 
-     Info<< "\ndelete table2" << nl;
-     forAllIter(HASHTABLE_CLASS<double>, table2, iter)
-     {
-         Info<< "deleting " << iter.key() << " => " << iter() << " ... ";
-         table2.erase(iter);
-         Info<< "deleted" << endl;
-     }
+    Info<< "\nerase table2 by iterator" << nl;
+    forAllIter(HASHTABLE_CLASS<double>, table2, iter)
+    {
+        Info<< "erasing " << iter.key() << " => " << iter() << " ... ";
+        table2.erase(iter);
+        Info<< "erased" << endl;
+    }
 
     Info<< "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl
@@ -134,6 +134,24 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
+    
+    // insert a few things into table2
+    table2.set("ada", 14.0);
+    table2.set("aeq", 15.0);
+    table2.set("aaw", 16.0);
+    table2.set("abs", 17.0);
+    table2.set("adx", 20.0);
+    
+    Info<< "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
+    label nErased = table1.erase(table2);
+    
+    Info<< "\nerase table2 keys from table1 (removed "
+        << nErased << " elements)" << nl
+        << "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
 
     Info<< "\nclearStorage table3 ... ";
     table3.clearStorage();
@@ -144,5 +162,4 @@ int main()
     return 0;
 }
 
-
 // ************************************************************************* //
diff --git a/applications/test/foamVersion/Make/files b/applications/test/foamVersion/Make/files
new file mode 100644
index 0000000000..eb39f3ac88
--- /dev/null
+++ b/applications/test/foamVersion/Make/files
@@ -0,0 +1,3 @@
+foamVersionString.C
+
+EXE = $(FOAM_USER_APPBIN)/foamVersionString
diff --git a/applications/test/foamVersion/Make/options b/applications/test/foamVersion/Make/options
new file mode 100644
index 0000000000..6a9e9810b3
--- /dev/null
+++ b/applications/test/foamVersion/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
+/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/foamVersion/foamVersionString.C b/applications/test/foamVersion/foamVersionString.C
new file mode 100644
index 0000000000..be63290a30
--- /dev/null
+++ b/applications/test/foamVersion/foamVersionString.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    foamVersionString.C
+
+Description
+    Print the OpenFOAM version strings.
+    Simultaneously the smallest possible program to use a minimal bit of
+    the OpenFOAM library
+
+\*---------------------------------------------------------------------------*/
+
+#include <iostream>
+#include "foamVersion.H"
+
+int main()
+{
+    std::cerr
+        << "build   " << Foam::FOAMbuild << "\n"
+        << "version " << Foam::FOAMversion << "\n";
+
+    return 0;
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 6ad19ab287..82e6f2c4c9 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -413,7 +413,7 @@ bool limitRefinementLevel
         }
     }
 
-    if (addCutCells.size() > 0)
+    if (addCutCells.size())
     {
         // Add cells to cutCells.
 
@@ -479,7 +479,7 @@ void doRefinement
     {
         const labelList& added = addedCells[oldCellI];
 
-        if (added.size() > 0)
+        if (added.size())
         {
             // Give all cells resulting from split the refinement level
             // of the master.
@@ -895,7 +895,7 @@ int main(int argc, char *argv[])
             << "    Selected for refinement :" << cutCells.size() << nl
             << endl;
 
-        if (cutCells.size() == 0)
+        if (cutCells.empty())
         {
             Info<< "Stopping refining since 0 cells selected to be refined ..."
                 << nl << endl;
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index a153b0ac66..67fdc0807e 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -358,18 +358,21 @@ int main(int argc, char *argv[])
     (
         dict.lookup("facesToTriangulate")
     );
+
     bool cutBoundary =
-            pointsToMove.size() > 0
-         || edgesToSplit.size() > 0
-         || facesToTriangulate.size() > 0;
+    (
+        pointsToMove.size()
+     || edgesToSplit.size()
+     || facesToTriangulate.size()
+    );
 
     List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
 
-    bool collapseEdge = edgesToCollapse.size() > 0;
+    bool collapseEdge = edgesToCollapse.size();
 
     List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
 
-    bool cellsToSplit = cellsToPyramidise.size() > 0;
+    bool cellsToSplit = cellsToPyramidise.size();
 
     //List<Tuple<pointField,point> >
     //  cellsToCreate(dict.lookup("cellsToCreate"));
@@ -523,7 +526,7 @@ int main(int argc, char *argv[])
         Info<< nl << "There was a problem in one of the inputs in the"
             << " dictionary. Not modifying mesh." << endl;
     }
-    else if (cellToPyrCentre.size() > 0)
+    else if (cellToPyrCentre.size())
     {
         Info<< nl << "All input cells located. Modifying mesh." << endl;
 
@@ -555,7 +558,7 @@ int main(int argc, char *argv[])
         Info << "Writing modified mesh to time " << runTime.value() << endl;
         mesh.write();
     }
-    else if (edgeToPos.size() > 0)
+    else if (edgeToPos.size())
     {
         Info<< nl << "All input edges located. Modifying mesh." << endl;
 
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 16747f4134..25b13eba88 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
     )
     {}
 
-    if (refCells.size() > 0)
+    if (refCells.size())
     {
         Info<< "Collected " << refCells.size() << " cells that need to be"
             << " refined to get closer to overall 2:1 refinement level limit"
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index ff6d22940c..4e5b501b85 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -652,7 +652,7 @@ int main(int argc, char *argv[])
         // Remove cut cells from cellsToCut  (Note:only relevant if -readSet)
         forAll(cuts.cellLoops(), cellI)
         {
-            if (cuts.cellLoops()[cellI].size() > 0)
+            if (cuts.cellLoops()[cellI].size())
             {
                 //Info<< "Removing cut cell " << cellI << " from wishlist"
                 //    << endl;
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index bb0a01fd1b..df84d13a79 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -584,7 +584,7 @@ int main(int argc, char *argv[])
 
     forAll (rawPatches, patchI)
     {
-        if (rawPatches[patchI].size() > 0 && cfxPatchTypes[patchI] != "BLKBDY")
+        if (rawPatches[patchI].size() && cfxPatchTypes[patchI] != "BLKBDY")
         {
             // Check if this name has been already created
             label existingPatch = -1;
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index b4acf24445..7b385bfe06 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -1486,7 +1486,7 @@ int main(int argc, char *argv[])
         }
         defaultBoundaryFaces.shrink();
 
-        if(defaultBoundaryFaces.size() != 0)
+        if (defaultBoundaryFaces.size())
         {
             Warning << " fluent mesh has " << defaultBoundaryFaces.size()
                     << " undefined boundary faces." << endl
@@ -1695,7 +1695,7 @@ int main(int argc, char *argv[])
     // soon negating the need for double output
     if (writeSets)
     {
-        if (cellGroupZoneID.size() > 1 )
+        if (cellGroupZoneID.size() > 1)
         {
             Info<< "Writing cell sets" << endl;
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index d3d732205c..62edc15af0 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -667,7 +667,7 @@ void readCells
 
         const labelList& zCells = zoneCells[zoneI];
 
-        if (zCells.size() > 0)
+        if (zCells.size())
         {
             Info<< "    " << zoneI << '\t' << zCells.size() << endl;
         }
@@ -778,7 +778,7 @@ int main(int argc, char *argv[])
 
     forAll(zoneCells, zoneI)
     {
-        if (zoneCells[zoneI].size() > 0)
+        if (zoneCells[zoneI].size())
         {
             nValidCellZones++;
         }
@@ -910,7 +910,7 @@ int main(int argc, char *argv[])
 
         const labelList& zFaces = zoneFaces[zoneI];
 
-        if (zFaces.size() > 0)
+        if (zFaces.size())
         {
             nValidFaceZones++;
 
@@ -940,7 +940,7 @@ int main(int argc, char *argv[])
 
         forAll(zoneCells, zoneI)
         {
-            if (zoneCells[zoneI].size() > 0)
+            if (zoneCells[zoneI].size())
             {
                 label physReg = zoneToPhys[zoneI];
 
@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
 
         forAll(zoneFaces, zoneI)
         {
-            if (zoneFaces[zoneI].size() > 0)
+            if (zoneFaces[zoneI].size())
             {
                 label physReg = zoneToPhys[zoneI];
 
@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (cz.size() > 0 || fz.size() > 0)
+    if (cz.size() || fz.size())
     {
         mesh.addZones(List<pointZone*>(0), fz, cz);
     }
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 477d2ba06c..520be5b146 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -752,7 +752,7 @@ int main(int argc, char *argv[])
     List<faceList> patchFaceVerts;
 
 
-    if (dofVertIndices.size() > 0)
+    if (dofVertIndices.size())
     {
         // Use the vertex constraints to patch. Is of course bit dodgy since
         // face goes on patch if all its vertices are on a constraint.
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 546aaa7439..6d41c037e6 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
     }
 
 
-    if (vertsToBoundary.size() > 0)
+    if (vertsToBoundary.size())
     {
         // Didn't find cells connected to boundary faces.
         WarningIn(args.executable())
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
index 26eb18e26d..3470fd71cc 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
@@ -229,7 +229,7 @@ void simpleMarkFeatures
 
     if (doNotPreserveFaceZones)
     {
-        if (faceZones.size() > 0)
+        if (faceZones.size())
         {
             WarningIn("simpleMarkFeatures(..)")
                 << "Detected " << faceZones.size()
@@ -239,7 +239,7 @@ void simpleMarkFeatures
     }
     else
     {
-        if (faceZones.size() > 0)
+        if (faceZones.size())
         {
             Info<< "Detected " << faceZones.size()
                 << " faceZones. Preserving these by marking their"
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index 4492a6f6b6..2a307e5df2 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -38,10 +38,7 @@ Class
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(meshDualiser, 0);
-}
+defineTypeNameAndDebug(Foam::meshDualiser, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -735,7 +732,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
                 )   << "Walked from face on patch:" << patchI
                     << " to face:" << faceI
                     << " fc:" << mesh_.faceCentres()[faceI]
-                    << " on patch:" << patches.whichPatch(faceI) 
+                    << " on patch:" << patches.whichPatch(faceI)
                     << abort(FatalError);
             }
 
@@ -886,7 +883,7 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh)
     faceToDualPoint_(mesh_.nFaces(), -1),
     edgeToDualPoint_(mesh_.nEdges(), -1)
 {}
-  
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
@@ -1083,7 +1080,7 @@ void Foam::meshDualiser::setRefinement
     {
         label pointI = multiCellFeaturePoints[i];
 
-        if (pointToDualCells_[pointI].size() > 0)
+        if (pointToDualCells_[pointI].size())
         {
             FatalErrorIn
             (
@@ -1133,7 +1130,7 @@ void Foam::meshDualiser::setRefinement
     // Normal points
     forAll(mesh_.points(), pointI)
     {
-        if (pointToDualCells_[pointI].size() == 0)
+        if (pointToDualCells_[pointI].empty())
         {
             pointToDualCells_[pointI].setSize(1);
             pointToDualCells_[pointI][0] = meshMod.addCell
@@ -1241,7 +1238,7 @@ void Foam::meshDualiser::setRefinement
             const edge& e = mesh_.edges()[edgeI];
 
             // We need a point on the edge if not all cells on both sides
-            // are the same. 
+            // are the same.
 
             const labelList& eCells = mesh_.edgeCells()[edgeI];
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
index d55d49242d..161123803e 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
@@ -136,7 +136,7 @@ void sammMesh::readCouples()
 
             forAll (curFaces, faceI)
             {
-                if (curFaces[faceI].size() == 0)
+                if (curFaces[faceI].empty())
                 {
                     zeroSizeFound++;
                 }
@@ -153,7 +153,7 @@ void sammMesh::readCouples()
 
                 forAll (oldFaces, faceI)
                 {
-                    if (oldFaces[faceI].size() > 0)
+                    if (oldFaces[faceI].size())
                     {
                         curFaces[nFaces] = oldFaces[faceI];
 
diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
index c4ff20791a..910df915d8 100644
--- a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
@@ -45,12 +45,11 @@ void starMesh::createCoupleMatches()
     // existing points list
 
     // Estimate the number of cells affected by couple matches
-    const label cellMapSize =
-        min
-        (
-            cellShapes_.size()/10,
-            couples_.size()*2
-        );
+    const label cellMapSize = min
+    (
+        cellShapes_.size()/10,
+        couples_.size()*2
+    );
 
     // Store newly created faces for each cell
     Map<SLList<face> > cellAddedFaces(cellMapSize);
@@ -322,7 +321,7 @@ void starMesh::createCoupleMatches()
 
                                     // A new point is created. Warning:
                                     // using original edge for accuracy.
-                                    // 
+                                    //
                                     coupleFacePoints.append
                                         (P + alpha*curMasterEdge.vec(points_));
                                 }
@@ -338,7 +337,7 @@ void starMesh::createCoupleMatches()
                         // master edge and vice versa. The problem is that
                         // no symmetry exists, i.e. both operations needs
                         // to be done separately for both master and slave
-                        // side. 
+                        // side.
 
                         // Master side
                         // check if the first or second point of slave edge is
@@ -625,11 +624,11 @@ void starMesh::createCoupleMatches()
 
             // Eliminate all zero-length edges
             face newMasterFace(labelList(tmpMasterFace.size(), labelMax));
-          
+
             // insert first point by hand. Careful: the first one is
             // used for comparison to allow the edge collapse across
             // point zero.
-            // 
+            //
             newMasterFace[0] = tmpMasterFace[0];
             label nMaster = 0;
 
@@ -823,7 +822,7 @@ void starMesh::createCoupleMatches()
             // insert first point by hand. Careful: the first one is
             // used for comparison to allow the edge collapse across
             // point zero.
-            // 
+            //
             newSlaveFace[0] = tmpSlaveFace[0];
             label nSlave = 0;
 
@@ -1097,7 +1096,7 @@ void starMesh::createCoupleMatches()
                         << "edges to consider: " << edgesToConsider << endl;
 #                   endif
 
-                    if (edgesToConsider.size() == 0)
+                    if (edgesToConsider.empty())
                     {
                         FatalErrorIn("void starMesh::createCoupleMatches()")
                             << setprecision(12)
@@ -1420,7 +1419,7 @@ void starMesh::createCoupleMatches()
         } // end of arbitrary match
     }
 
-    if (couples_.size() > 0)
+    if (couples_.size())
     {
         // Loop through all cells and reset faces for removal to zero size
         const labelList crfToc = cellRemovedFaces.toc();
@@ -1442,7 +1441,7 @@ void starMesh::createCoupleMatches()
                 cellFaces_[curCell][curRemovedFacesIter()].setSize(0);
             }
 
-            if (curRemovedFaces.size() > 0)
+            if (curRemovedFaces.size())
             {
                 // reset the shape pointer to unknown
                 cellShapes_[curCell] = cellShape(*unknownPtr_, labelList(0));
@@ -1468,7 +1467,7 @@ void starMesh::createCoupleMatches()
             // copy original faces that have not been removed
             forAll (oldFaces, faceI)
             {
-                if (oldFaces[faceI].size() > 0)
+                if (oldFaces[faceI].size())
                 {
                     newFaces[nNewFaces] = oldFaces[faceI];
                     nNewFaces++;
@@ -1491,7 +1490,7 @@ void starMesh::createCoupleMatches()
             // reset the size of the face list
             newFaces.setSize(nNewFaces);
 
-            if (curAddedFaces.size() > 0)
+            if (curAddedFaces.size())
             {
                 // reset the shape pointer to unknown
                 cellShapes_[curCell] = cellShape(*unknownPtr_, labelList(0));
diff --git a/applications/utilities/mesh/conversion/starToFoam/starMesh.C b/applications/utilities/mesh/conversion/starToFoam/starMesh.C
index f5fbb9f860..a495ae0362 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starMesh.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starMesh.C
@@ -264,7 +264,7 @@ starMesh::starMesh
 
     readCouples();
 
-    if (couples_.size() > 0)
+    if (couples_.size())
     {
         createCoupleMatches();
     }
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 4f9c369c7d..7fcf2a586b 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
     {
         nodeStream.getLine(line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     IStringStream nodeLine(line);
 
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
         {
             nodeStream.getLine(line);
 
-            if ((line.size() > 0) && (line[0] != '#'))
+            if (line.size() && line[0] != '#')
             {
                 IStringStream nodeLine(line);
 
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
     {
         eleStream.getLine(line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     IStringStream eleLine(line);
 
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
     {
         eleStream.getLine(line);
 
-        if ((line.size() > 0) && (line[0] != '#'))
+        if (line.size() && line[0] != '#')
         {
             IStringStream eleLine(line);
 
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
         {
             faceStream.getLine(line);
         }
-        while((line.size() > 0) && (line[0] == '#'));
+        while (line.size() && line[0] == '#');
 
         IStringStream faceLine(line);
 
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
         {
             faceStream.getLine(line);
 
-            if ((line.size() > 0) && (line[0] != '#'))
+            if (line.size() && line[0] != '#')
             {
                 IStringStream faceLine(line);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index 5a273f7acb..640971ada0 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -118,7 +118,7 @@ Foam::label Foam::blockMesh::numZonedBlocks() const
 
     forAll(*this, blockI)
     {
-        if (operator[](blockI).blockDef().zoneName().size() > 0)
+        if (operator[](blockI).blockDef().zoneName().size())
         {
             num++;
         }
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 1c3bd34a22..1723fa5101 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
             const labelListList& blockCells = b.cells();
             const word& zoneName = b.blockDef().zoneName();
 
-            if (zoneName.size() > 0)
+            if (zoneName.size())
             {
                 HashTable<label>::const_iterator iter = zoneMap.find(zoneName);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
index 6d7e80d74e..3347db180b 100644
--- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
@@ -1,6 +1,6 @@
         Info<< "Creating merge patch pairs" << nl << endl;
 
-        if (mergePatchPairs.size() > 0)
+        if (mergePatchPairs.size())
         {
             // Create and add point and face zones and mesh modifiers
             List<pointZone*> pz(mergePatchPairs.size());
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 2596ae6150..de69375595 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -177,7 +177,7 @@ Foam::label Foam::checkTopology
 
             primitivePatch::surfaceTopo pTyp = pp.surfaceType();
 
-            if (pp.size() == 0)
+            if (pp.empty())
             {
                 Pout<< setw(34) << "ok (empty)";
             }
@@ -232,7 +232,7 @@ Foam::label Foam::checkTopology
             Pout<< endl;
         }
 
-        if (points.size() > 0)
+        if (points.size())
         {
             Pout<< "  <<Writing " << points.size()
                 << " conflicting points to set "
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 238d8232f0..d6d58dd542 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -172,7 +172,7 @@ void filterPatches(polyMesh& mesh)
 
         if (isA<processorPolyPatch>(pp))
         {
-            if (pp.size() > 0)
+            if (pp.size())
             {
                 allPatches.append
                 (
@@ -586,7 +586,7 @@ int main(int argc, char *argv[])
     // 1. Add all new patches
     // ~~~~~~~~~~~~~~~~~~~~~~
 
-    if (patchSources.size() > 0)
+    if (patchSources.size())
     {
         // Old and new patches.
         DynamicList<polyPatch*> allPatches(patches.size()+patchSources.size());
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index 292d2a0056..616cfb4ce7 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -34,10 +34,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(mergePolyMesh, 1);
-}
+defineTypeNameAndDebug(Foam::mergePolyMesh, 1);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -142,7 +139,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
 
     // Point zones
     wordList curPointZoneNames = pointZones().names();
-    if (curPointZoneNames.size() > 0)
+    if (curPointZoneNames.size())
     {
         pointZoneNames_.setCapacity(2*curPointZoneNames.size());
     }
@@ -155,7 +152,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
     // Face zones
     wordList curFaceZoneNames = faceZones().names();
 
-    if (curFaceZoneNames.size() > 0)
+    if (curFaceZoneNames.size())
     {
         faceZoneNames_.setCapacity(2*curFaceZoneNames.size());
     }
@@ -167,7 +164,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
     // Cell zones
     wordList curCellZoneNames = cellZones().names();
 
-    if (curCellZoneNames.size() > 0)
+    if (curCellZoneNames.size())
     {
         cellZoneNames_.setCapacity(2*curCellZoneNames.size());
     }
@@ -333,11 +330,11 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
         newOwn = own[faceI];
         if (newOwn > -1) newOwn = renumberCells[newOwn];
 
-        if (newPatch > -1) 
+        if (newPatch > -1)
         {
             newNei = -1;
-        } 
-        else 
+        }
+        else
         {
             newNei = nei[faceI];
             newNei = renumberCells[newNei];
@@ -373,7 +370,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
                 )
             );
     }
-        
+
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index b24065df06..07190e49f9 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -48,7 +48,7 @@ string getLine(std::ifstream& is)
     {
         std::getline(is, line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     return line;
 }
@@ -60,13 +60,13 @@ labelList parseVertices(const string& line)
     DynamicList<label> verts;
 
     // Assume 'l' is followed by space.
-    label endNum = 1;
+    string::size_type endNum = 1;
 
     do
     {
-        label startNum = line.find_first_not_of(' ', endNum);
+        string::size_type startNum = line.find_first_not_of(' ', endNum);
 
-        if (startNum == label(string::npos))
+        if (startNum == string::npos)
         {
             break;
         }
@@ -74,7 +74,7 @@ labelList parseVertices(const string& line)
         endNum = line.find(' ', startNum);
 
         string vertexSpec;
-        if (endNum != label(string::npos))
+        if (endNum != string::npos)
         {
             vertexSpec = line.substr(startNum, endNum-startNum);
         }
@@ -83,10 +83,10 @@ labelList parseVertices(const string& line)
             vertexSpec = line.substr(startNum, line.size() - startNum);
         }
 
-        label slashPos = vertexSpec.find('/');
+        string::size_type slashPos = vertexSpec.find('/');
 
         label vertI = 0;
-        if (slashPos != label(string::npos))
+        if (slashPos != string::npos)
         {
             IStringStream intStream(vertexSpec.substr(0, slashPos));
 
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index de684afe48..95c7973d2c 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
     {
         const labelList& added = oldToNew[oldCellI];
 
-        if (added.size() > 0)
+        if (added.size())
         {
             forAll(added, i)
             {
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 0bfa7b7aba..8f49a94766 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -89,7 +89,7 @@ void backup
     const word& toName
 )
 {
-    if (fromSet.size() > 0)
+    if (fromSet.size())
     {
         Pout<< "    Backing up " << fromName << " into " << toName << endl;
 
@@ -284,7 +284,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         polyMesh::meshSubDir/"sets"
     );
     IOobjectList cellSets(objects.lookupClass(cellSet::typeName));
-    if (cellSets.size() > 0)
+    if (cellSets.size())
     {
         os  << "cellSets:" << endl;
         forAllConstIter(IOobjectList, cellSets, iter)
@@ -294,7 +294,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         }
     }
     IOobjectList faceSets(objects.lookupClass(faceSet::typeName));
-    if (faceSets.size() > 0)
+    if (faceSets.size())
     {
         os  << "faceSets:" << endl;
         forAllConstIter(IOobjectList, faceSets, iter)
@@ -304,7 +304,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         }
     }
     IOobjectList pointSets(objects.lookupClass(pointSet::typeName));
-    if (pointSets.size() > 0)
+    if (pointSets.size())
     {
         os  << "pointSets:" << endl;
         forAllConstIter(IOobjectList, pointSets, iter)
@@ -347,7 +347,7 @@ bool doCommand
     bool ok = true;
 
     // Set to work on
-    autoPtr<topoSet> currentSetPtr(NULL);
+    autoPtr<topoSet> currentSetPtr;
 
     word sourceType;
 
@@ -383,7 +383,7 @@ bool doCommand
             currentSet.resize(max(currentSet.size(), typSize));
         }
 
-        if (!currentSetPtr.valid())
+        if (currentSetPtr.empty())
         {
             Pout<< "    Cannot construct/load set "
                 << topoSet::localPath(mesh, setName) << endl;
@@ -522,7 +522,7 @@ bool doCommand
 
         Pout<< fIOErr.message().c_str() << endl;
 
-        if (sourceType.size() != 0)
+        if (sourceType.size())
         {
             Pout<< topoSetSource::usage(sourceType).c_str();
         }
@@ -533,7 +533,7 @@ bool doCommand
 
         Pout<< fErr.message().c_str() << endl;
 
-        if (sourceType.size() != 0)
+        if (sourceType.size())
         {
             Pout<< topoSetSource::usage(sourceType).c_str();
         }
@@ -571,7 +571,7 @@ commandStatus parseType
     IStringStream& is
 )
 {
-    if (setType.size() == 0)
+    if (setType.empty())
     {
         Pout<< "Type 'help' for usage information" << endl;
 
@@ -689,7 +689,7 @@ commandStatus parseAction(const word& actionName)
 {
     commandStatus stat = INVALID;
 
-    if (actionName.size() != 0)
+    if (actionName.size())
     {
         try
         {
@@ -792,7 +792,7 @@ int main(int argc, char *argv[])
 
             std::getline(*fileStreamPtr, rawLine);
 
-            if (rawLine.size() > 0)
+            if (rawLine.size())
             {
                 Pout<< "Doing:" << rawLine << endl;
             }
@@ -821,7 +821,7 @@ int main(int argc, char *argv[])
 #           endif
         }
 
-        if (rawLine.size() == 0 || rawLine[0] == '#')
+        if (rawLine.empty() || rawLine[0] == '#')
         {
             continue;
         }
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index f71be6ac7d..aef00fe7e9 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -100,10 +100,10 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
             << exit(FatalError);
     }
 
-    if (bMesh[patchI].size() != 0)
+    if (bMesh[patchI].size())
     {
         FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
-            << "Patch " << name << " is present but not of zero size"
+            << "Patch " << name << " is present but non-zero size"
             << exit(FatalError);
     }
 }
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index d52403f0b1..e3cb83ad38 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -878,7 +878,7 @@ void createAndWriteRegion
     {
         const polyPatch& pp = newPatches[patchI];
 
-        if (isA<processorPolyPatch>(pp) && pp.size() > 0)
+        if (isA<processorPolyPatch>(pp) && pp.size())
         {
             oldToNew[patchI] = newI++;
         }
@@ -1049,7 +1049,7 @@ label findCorrespondingZone
 
     labelList regionCells = findIndices(cellRegion, regionI);
 
-    if (regionCells.size() == 0)
+    if (regionCells.empty())
     {
         // My local portion is empty. Maps to any empty cellZone. Mark with
         // special value which can get overwritten by other processors.
@@ -1200,7 +1200,7 @@ int main(int argc, char *argv[])
     boolList blockedFace;
 
     // Read from faceSet
-    if (blockedFacesName.size() > 0)
+    if (blockedFacesName.size())
     {
         faceSet blockedFaceSet(mesh, blockedFacesName);
         Info<< "Read " << returnReduce(blockedFaceSet.size(), sumOp<label>())
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 54e3cd1b78..4773654752 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -82,7 +82,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
             << exit(FatalError);
     }
 
-    if (bMesh[patchI].size() == 0)
+    if (bMesh[patchI].empty())
     {
         FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
             << "Patch " << name << " is present but zero size"
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 208066016e..4b50082e10 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
     );
 
 
-    if (args.options().size() == 0)
+    if (args.options().empty())
     {
         FatalErrorIn(args.executable())
             << "No options supplied, please use one or more of "
diff --git a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C b/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
index bfe9e585da..ad78b2a914 100644
--- a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
+++ b/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
@@ -104,7 +104,7 @@ void domainDecomposition::distributeCells()
         }
     }
 
-    if (sameProcFaces.size() > 0)
+    if (sameProcFaces.size())
     {
         Info<< "Selected " << sameProcFaces.size()
             << " faces whose owner and neighbour cell should be kept on the"
@@ -123,7 +123,7 @@ void domainDecomposition::distributeCells()
         *this
     );
 
-    if (sameProcFaces.size() == 0)
+    if (sameProcFaces.empty())
     {
         cellToProc_ = decomposePtr().decompose(cellCentres());
     }
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index a01e6d69e7..ac08b17645 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
         args
     );
 
-    if (!timeDirs.size())
+    if (timeDirs.empty())
     {
         FatalErrorIn(args.executable())
             << "No times selected"
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (cloudObjects.size() > 0)
+        if (cloudObjects.size())
         {
             // Pass2: reconstruct the cloud
             forAllConstIter(HashTable<IOobjectList>, cloudObjects, iter)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index e7b481adc2..980a3c6153 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -558,7 +558,7 @@ void ensightFieldAscii
 
     GeometricField<Type, fvPatchField, volMesh> vf(fieldObject, mesh);
 
-    if (!patchNames.size())
+    if (patchNames.empty())
     {
         if (Pstream::master())
         {
@@ -633,7 +633,7 @@ void ensightFieldAscii
         const word& patchName = iter.key();
         const labelList& patchProcessors = iter();
 
-        if (!patchNames.size() || patchNames.found(patchName))
+        if (patchNames.empty() || patchNames.found(patchName))
         {
             if (patchIndices.found(patchName))
             {
@@ -734,7 +734,7 @@ void ensightFieldBinary
 
     GeometricField<Type, fvPatchField, volMesh> vf(fieldObject, mesh);
 
-    if (!patchNames.size())
+    if (patchNames.empty())
     {
         if (Pstream::master())
         {
@@ -805,7 +805,7 @@ void ensightFieldBinary
         const word& patchName = iter.key();
         const labelList& patchProcessors = iter();
 
-        if (!patchNames.size() || patchNames.found(patchName))
+        if (patchNames.empty() || patchNames.found(patchName))
         {
             if (patchIndices.found(patchName))
             {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 537fa7d075..b69a9264c1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -129,7 +129,7 @@ Foam::ensightMesh::ensightMesh
     {
         wordList patchNameList(IStringStream(args.options()["patches"])());
 
-        if (!patchNameList.size())
+        if (patchNameList.empty())
         {
             patchNameList = allPatchNames_.toc();
         }
@@ -163,7 +163,7 @@ Foam::ensightMesh::ensightMesh
     label nHexes = 0;
     label nPolys = 0;
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         forAll(cellShapes, celli)
         {
@@ -267,7 +267,7 @@ Foam::ensightMesh::ensightMesh
         const word& patchName = iter.key();
         nFacePrimitives nfp;
 
-        if (!patchNames_.size() || patchNames_.found(patchName))
+        if (patchNames_.empty() || patchNames_.found(patchName))
         {
             if (patchIndices_.found(patchName))
             {
@@ -403,7 +403,7 @@ void Foam::ensightMesh::writePrimsBinary
 
     numElem = cellShapes.size();
 
-    if (cellShapes.size() > 0)
+    if (cellShapes.size())
     {
         // All the cellShapes have the same number of elements!
         int numIntElem = cellShapes.size()*cellShapes[0].size();
@@ -917,7 +917,7 @@ void Foam::ensightMesh::writeAscii
 
     labelList pointOffsets(Pstream::nProcs(), 0);
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         label nPoints = points.size();
         Pstream::gather(nPoints, sumOp<label>());
@@ -1044,7 +1044,7 @@ void Foam::ensightMesh::writeAscii
     {
         const labelList& patchProcessors = iter();
 
-        if (!patchNames_.size() || patchNames_.found(iter.key()))
+        if (patchNames_.empty() || patchNames_.found(iter.key()))
         {
             const word& patchName = iter.key();
             const nFacePrimitives& nfp = nPatchPrims_.find(patchName)();
@@ -1244,7 +1244,7 @@ void Foam::ensightMesh::writeBinary
 
     labelList pointOffsets(Pstream::nProcs(), 0);
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         label nPoints = points.size();
         Pstream::gather(nPoints, sumOp<label>());
@@ -1373,7 +1373,7 @@ void Foam::ensightMesh::writeBinary
         iCount ++;
         const labelList& patchProcessors = iter();
 
-        if (!patchNames_.size() || patchNames_.found(iter.key()))
+        if (patchNames_.empty() || patchNames_.found(iter.key()))
         {
             const word& patchName = iter.key();
             const nFacePrimitives& nfp = nPatchPrims_.find(patchName)();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
index 8e3faa359f..f5d7477530 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
@@ -57,7 +57,7 @@ void writeEnsDataBinary
     std::ofstream& ensightFile
 )
 {
-    if (sf.size() > 0)
+    if (sf.size())
     {
         List<float> temp(sf.size());
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
index 3a4d626efb..6c640b41fa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
@@ -77,9 +77,9 @@ forAllIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
         }
     }
 
-    if (!cloudIter().size())
+    if (cloudIter().empty())
     {
-        Info<< "removing cloud " << cloudName<< endl;
+        Info<< "removing cloud " << cloudName << endl;
         cloudFields.erase(cloudIter);
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index 63f9a45ee7..81ac4facac 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
 #   include "getFieldNames.H"
 
     bool hasLagrangian = false;
-    if ((sprayScalarNames.size() > 0) || (sprayVectorNames.size() > 0))
+    if (sprayScalarNames.size() || sprayVectorNames.size())
     {
         hasLagrangian = true;
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 45d5b3fc2f..76f834c431 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -80,7 +80,7 @@ for(label i=0; i < nTypes; i++)
             wordList lagrangianScalarNames = objects.names("scalarField");
             wordList lagrangianVectorNames = objects.names("vectorField");
 
-            if (particles.size() > 0)
+            if (particles.size())
             {
 #               include "gmvOutputLagrangian.H"
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
index 4fa7ee1ec5..89c126c1e3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
@@ -49,16 +49,11 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
         gmvFile << name  << nl;
 
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             gmvFile << s[n] << token::SPACE;
         }
@@ -85,16 +80,11 @@ forAll(lagrangianVectorNames, i)
         )
     );
 
-    if (v.size() != 0)
+    if (v.size())
     {
         gmvFile << name + "x" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].x() << token::SPACE;
         }
@@ -102,12 +92,7 @@ forAll(lagrangianVectorNames, i)
 
         gmvFile << name + "y" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].y() << token::SPACE;
         }
@@ -115,19 +100,13 @@ forAll(lagrangianVectorNames, i)
 
         gmvFile << name + "z" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].z() << token::SPACE;
         }
         gmvFile << nl;
     }
 
-
 }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
index 682f9e27e0..f5d5b3c8c6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
@@ -47,16 +47,11 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
         gmvFile << name  << nl;
 
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             gmvFile << s[n] << token::SPACE;
         }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index e60ebc1448..45c5f37996 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
         (
             args.options().found("time")
          || args.options().found("latestTime")
-         || cellSetName.size() > 0
+         || cellSetName.size()
          || regionName != polyMesh::defaultRegion
         )
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 27d8fa0e97..838d5e2971 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -58,7 +58,7 @@ void readFields
         ++iter
     )
     {
-        if (!selectedFields.size() || selectedFields.found(iter()->name()))
+        if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
             fields.set
             (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
index 7552e07e27..b8376e2a99 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
@@ -47,7 +47,7 @@ Foam::vtkMesh::vtkMesh
     subsetter_(baseMesh),
     setName_(setName)
 {
-    if (setName.size() > 0)
+    if (setName.size())
     {
         // Read cellSet using whole mesh
         cellSet currentSet(baseMesh_, setName_);
@@ -71,7 +71,7 @@ Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate()
 
         topoPtr_.clear();
 
-        if (setName_.size() > 0)
+        if (setName_.size())
         {
             Info<< "Subsetting mesh based on cellSet " << setName_ << endl;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
index 7e6f411699..d2b1e9f0e3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
@@ -105,13 +105,13 @@ public:
             //- Check if running subMesh
             bool useSubMesh() const
             {
-                return setName_.size() > 0;
+                return setName_.size();
             }
 
             //- topology
             const vtkTopo& topo() const
             {
-                if (!topoPtr_.valid())
+                if (topoPtr_.empty())
                 {
                     topoPtr_.reset(new vtkTopo(mesh()));
                 }
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index a26ba88a5c..cb25ac5089 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -154,6 +154,11 @@ class vtkPV3Foam
                 return size_;
             }
 
+            bool empty() const
+            {
+                return (size_ == 0);
+            }
+
             void reset()
             {
                 start_ = -1;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index 74bcac3b78..f01839a930 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -147,14 +147,14 @@ int USERD_set_filenames
     
     bool lagrangianNamesFound = false;
     label n = 0;
-    while ((!lagrangianNamesFound) && (n<Num_time_steps))
+    while (!lagrangianNamesFound && n < Num_time_steps)
     {
         runTime.setTime(TimeList[n+1], n+1);
 
         Cloud<passiveParticle> lagrangian(*meshPtr);
 
         n++;
-        if (lagrangian.size()>0)
+        if (lagrangian.size())
         {
             lagrangianNamesFound = true;
         }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
index de8f4ffaf9..e9259e3cc7 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
@@ -4,7 +4,6 @@ nVar -= Num_variables - nSprayVariables;
 
 if (nVar >= 0)
 {
-    
     word name = lagrangianScalarNames[nVar];
 
     IOField<scalar> s
@@ -20,15 +19,9 @@ if (nVar >= 0)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
-
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             var_array[n+1] = s[n];
         }
@@ -36,7 +29,7 @@ if (nVar >= 0)
 }
 else
 {
-    //Info << "getLagrangianScalar: nVar = " << nVar << endl;
+    // Info << "getLagrangianScalar: nVar = " << nVar << endl;
     return Z_UNDEF;
 }
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
index 59f2806a32..42fcc8560f 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
@@ -21,16 +21,10 @@ if (nVar >= 0)
         )
     );
 
-    if (v.size() != 0)
+    if (v.size())
     {
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
-
             if (component == 0)
             {
                 var_array[n+1] = v[n].x();
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index 604046862d..10b29fc8b3 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -235,7 +235,7 @@ static void createFieldNames
     HashSet<word> surfScalarHash;
     HashSet<word> surfVectorHash;
 
-    if (setName.size() == 0)
+    if (setName.empty())
     {
         forAll(Times, timeI)
         {
@@ -536,13 +536,12 @@ void user_query_file_function
     fileName caseName(rootAndCase.name());
 
     // handle trailing '/'
-    if (caseName.size() == 0)
+    if (caseName.empty())
     {
         caseName = rootDir.name();
-        rootDir = rootDir.path();
+        rootDir  = rootDir.path();
     }
 
-
     Info<< "rootDir  : " << rootDir << endl
         << "caseName : " << caseName << endl
         << "setName  : " << setName << endl;
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
index 82d49c1135..09f63f50da 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
@@ -150,7 +150,7 @@ const Foam::fvMesh& Foam::readerDatabase::mesh() const
             << "No mesh set" << abort(FatalError);
     }
 
-    if (setName_.size() == 0)
+    if (setName_.empty())
     {
         return *meshPtr_;
     }
@@ -265,7 +265,7 @@ void Foam::readerDatabase::loadMesh()
         IOobject::AUTO_WRITE
     );
 
-    if (setName_.size() != 0)
+    if (setName_.size())
     {
         Info<< "Subsetting mesh based on cellSet " << setName_ << endl;
 
@@ -294,9 +294,9 @@ Foam::polyMesh::readUpdateState Foam::readerDatabase::setTime
         // Update loaded mesh
         meshChange = meshPtr_->readUpdate();
 
-        if ((setName_.size() != 0) && (meshChange != polyMesh::UNCHANGED))
+        if (setName_.size() && meshChange != polyMesh::UNCHANGED)
         {
-            Info<< "Subsetting mesh based on " << setName_ << endl;        
+            Info<< "Subsetting mesh based on " << setName_ << endl;
 
             fvMeshSubset& mesh = *meshPtr_;
 
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index 6f593c1309..e57aa9761c 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -206,7 +206,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             // Do closer inspection for unmapped particles
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            if (unmappedSource.size() > 0)
+            if (unmappedSource.size())
             {
                 meshSearch targetSearcher(meshTarget, false);
 
@@ -237,7 +237,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             Info<< "    after additional mesh searching found "
                 << targetParcels.size() << " parcels in target mesh." << endl;
 
-            if (addParticles.size() > 0)
+            if (addParticles.size())
             {
                 IOPosition<passiveParticle>(targetParcels).write();
 
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 6ad1a6e950..e7b7890074 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -242,9 +242,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        illegalFaces.shrink();
-
-        if (illegalFaces.size() > 0)
+        if (illegalFaces.size())
         {
             Pout<< "Surface has " << illegalFaces.size()
                 << " illegal triangles." << endl;
@@ -628,7 +626,7 @@ int main(int argc, char *argv[])
         triSurfaceSearch querySurf(surf);
         surfaceIntersection inter(querySurf);
 
-        if ((inter.cutEdges().size() == 0) && (inter.cutPoints().size() == 0))
+        if (inter.cutEdges().empty() && inter.cutPoints().empty())
         {
             Pout<< "Surface is not self-intersecting" << endl;
         }
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index 4c4f366af4..58168e5722 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -860,7 +860,7 @@ label collapseBase(triSurface& surf, const scalar minLen)
                     splitWeights
                 );
 
-                if (splitVerts.size() > 0)
+                if (splitVerts.size())
                 {
                     // Split edge using splitVerts. All non-collapsed triangles 
                     // using edge will get split.
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 6daf7928a3..046f9cefe8 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -49,9 +49,9 @@ void readNASEdges
     edgeList& allEdges
 )
 {
-   IFstream OBJfile(inFileName);
+    IFstream is(inFileName);
 
-    if (!OBJfile.good())
+    if (!is.good())
     {
         FatalErrorIn("readNASEdges")
             << "Cannot read file " << inFileName
@@ -68,14 +68,14 @@ void readNASEdges
     DynamicList<label> edgeIndices;
 
 
-    while (OBJfile.good())
+    while (is.good())
     {
         string line;
-        OBJfile.getLine(line);
+        is.getLine(line);
 
-        if (line.size() > 0 && line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
-            // Skip comment
+            // Skip empty and comment
             continue;
         }
 
@@ -87,9 +87,9 @@ void readNASEdges
             while (true)
             {
                 string buf;
-                OBJfile.getLine(buf);
+                is.getLine(buf);
 
-                if (buf.size() > 72 && buf[72]=='+')
+                if (buf.size() > 72 && buf[72] == '+')
                 {
                     line += buf.substr(8, 64);
                 }
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index fa5f26ae30..71ab4c8b01 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
         word patchName = pp.name();
 
-        if (patchName.size() == 0)
+        if (patchName.empty())
         {
             patchName = "patch" + Foam::name(patchI);
         }
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 2ffc384aa0..1c1a725cad 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
         meshSubsetDict.lookup("zone")
     );
 
-    if ((markedZone.size() != 0) && (markedZone.size() != 2))
+    if (markedZone.size() && markedZone.size() != 2)
     {
         FatalErrorIn(args.executable())
             << "zone specification should be two points, min and max of "
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     // pick up faces connected to "localPoints"
     //
 
-    if (markedPoints.size() > 0)
+    if (markedPoints.size())
     {
         Info << "Found " << markedPoints.size() << " marked point(s)." << endl;
 
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
     // pick up faces connected to "edges"
     //
 
-    if (markedEdges.size() > 0)
+    if (markedEdges.size())
     {
         Info << "Found " << markedEdges.size() << " marked edge(s)." << endl;
 
@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
     // Number of additional faces picked up because of addFaceNeighbours
     label nFaceNeighbours = 0;
 
-    if (markedFaces.size() > 0)
+    if (markedFaces.size())
     {
         Info << "Found " << markedFaces.size() << " marked face(s)." << endl;
 
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 7d5bc0e1bd..cf1020009b 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     Info<< "Writing surf to " << outFileName << " ..." << endl;
 
 
-    if (args.options().size() == 0)
+    if (args.options().empty())
     {
         FatalErrorIn(args.executable())
             << "No options supplied, please use one or more of "
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index 7910b6924f..8f461a008b 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -35,7 +35,7 @@
 #------------------------------------------------------------------------------
 if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ]
 then
-   cat <<USAGE 1>&2
+    cat <<USAGE 1>&2
 Usage: ${0##*/} srcDir dstDir
 
     Copy OpenFOAM settings from one case to another, without copying
@@ -46,30 +46,23 @@ USAGE
    exit 1
 fi
 
-srcDir=$1
-dstDir=$2
+srcDir=${1%/}
+dstDir=${2%/}
 
-if [ ! -d $srcDir ]
-then
-   echo "Error: directory '$srcDir' does not exist"
-   exit 1
-fi
-
-if [ ! -d $dstDir ]
-then
-   echo "Error: directory '$dstDir' does not exist"
-   exit 1
-fi
+for i in $srcDir $dstDir
+do
+    [ -d "$i" ] || { echo "Error: directory '$i' does not exist"; exit 1; }
+done
 
 # check that the srcDir looks okay
 for i in $srcDir/constant $srcDir/system
 do
-   if [ ! -d $i ]
-   then
-      echo "Error: no '${i##*/}' directory in '$srcDir'"
-      echo "       does not appear to be an OpenFOAM case"
-      exit 1
-   fi
+    if [ ! -d "$i" ]
+    then
+        echo "Error: no '${i##*/}' directory in '$srcDir'"
+        echo "       does not appear to be an OpenFOAM case"
+        exit 1
+    fi
 done
 
 # files and directories to copy
@@ -82,19 +75,19 @@ fileList=$(find -H $srcDir -mindepth 1 -maxdepth 1 -not -name "processor*")
 
 for i in $fileList
 do
-   name="${i##*/}"
-   # skip numerical (results) directories (except 0)
-   # and things that look like queuing system output or log files
-   case "$name" in
-   [1-9] | [0-9]?* | foam.[eo][1-9]* | log | *.log )
-      echo "$i  [skipped]"
-      continue
-      ;;
-   *)
-      echo "$i -> $dstDir/$name"
-      rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir
-      ;;
-   esac
+    name="${i##*/}"
+    # skip numerical (results) directories (except 0)
+    # and things that look like log files or queuing system output
+    case "$name" in
+    [1-9] | [0-9]?* | log | *.log | foam.[eo][1-9]* )
+        echo "$i  [skipped]"
+        continue
+        ;;
+    *)
+        echo "$i -> $dstDir/$name"
+        rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir
+        ;;
+    esac
 done
 
 # --------------------------------------------------------------- end-of-file
diff --git a/etc/bashrc b/etc/bashrc
index 28028384c6..7c9f9ecad3 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -36,9 +36,10 @@ export WM_PROJECT=OpenFOAM
 # export WM_PROJECT_VERSION=1.5.x
 : ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
 
-
-#!!User:
-#    either set $FOAM_INST_DIR before sourcing this file or set
+################################################################################
+# USER EDITABLE PART
+#
+# either set $FOAM_INST_DIR before sourcing this file or set
 #    $foamInstall below to where OpenFOAM is installed
 #
 # Location of FOAM installation
@@ -47,9 +48,22 @@ foamInstall=$HOME/$WM_PROJECT
 # foamInstall=~$WM_PROJECT
 # foamInstall=/usr/local/$WM_PROJECT
 # foamInstall=/opt/$WM_PROJECT
+#
+# END OF (NORMAL) USER EDITABLE PART
+################################################################################
 
+# note the location for later use (eg, in job scripts)
 : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
 
+# The old dirs to be cleaned from the various environment variables
+# - remove anything under top-level directory.
+# NB: the WM_PROJECT_INST_DIR might not be identical between versions
+foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$USER"
+if [ "$WM_PROJECT_INST_DIR" != "$FOAM_INST_DIR" ]
+then
+    foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
+fi
+
 
 # Location of site/user files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -169,21 +183,18 @@ USAGE
 esac
 
 
-# Clean standard environment variables (PATH, MANPATH, LD_LIBRARY_PATH)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
 
-# Remove anything under top-level foam directory
-wildCards="$WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$USER"
-
-#- Clean path/PATH
-cleanPath=`$cleanProg "$PATH" "$wildCards"` && PATH="$cleanPath"
+#- Clean PATH
+cleanEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanEnv"
 
 #- Clean LD_LIBRARY_PATH
-cleanPath=`$cleanProg "$LD_LIBRARY_PATH" "$wildCards"` && LD_LIBRARY_PATH="$cleanPath"
+cleanEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanEnv"
 
 #- Clean MANPATH
-cleanPath=`$cleanProg "$MANPATH" "$wildCards"` && MANPATH="$cleanPath"
+cleanEnv=`$cleanProg "$MANPATH" "$foamCleanDirs"` && MANPATH="$cleanEnv"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
@@ -212,29 +223,30 @@ _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
 
 
-# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#- Clean path/PATH. Only remove duplicates
-cleanPath=`$cleanProg "$PATH"` && PATH="$cleanPath"
+# Clean environment paths again. Only remove duplicates
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#- Clean PATH
+cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv"
 
 #- Clean LD_LIBRARY_PATH
-cleanPath=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanPath"
+cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv"
 
 #- Clean MANPATH
-cleanPath=`$cleanProg "$MANPATH"` && MANPATH="$cleanPath"
+cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
 #- Clean LD_PRELOAD
-if [ "$LD_PRELOAD" != "" ]; then
-    cleanPath=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanPath"
+if [ "$LD_PRELOAD" != "" ]
+then
+    cleanEnv=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanEnv"
     export LD_PRELOAD
 fi
 
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanPath cleanProg foamInstall
+unset cleanEnv cleanProg foamInstall foamOldDirs
 unset _foamSource
 
 # -----------------------------------------------------------------------------
diff --git a/etc/controlDict b/etc/controlDict
index 7601a024bc..d1a95604ef 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -688,7 +688,6 @@ DebugSwitches
     steadyState         0;
     stl                 0;
     stochasticDispersionRAS 0;
-    string              0;
     supersonicFreestream 0;
     surfaceFeatures     0;
     surfaceInterpolation 0;
diff --git a/etc/cshrc b/etc/cshrc
index c12ff2e6ba..b1dfd9ec34 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -35,7 +35,9 @@ setenv WM_PROJECT OpenFOAM
 # setenv WM_PROJECT_VERSION 1.5.x
 if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
 
-#!!User:
+################################################################################
+# USER EDITABLE PART
+#
 #    either setenv FOAM_INST_DIR before sourcing this file or set
 #    foamInstall below to where OpenFOAM is installed
 #
@@ -45,9 +47,17 @@ set foamInstall = $HOME/$WM_PROJECT
 # set foamInstall = ~$WM_PROJECT
 # set foamInstall = /usr/local/$WM_PROJECT
 # set foamInstall = /opt/$WM_PROJECT
+#
+# END OF (NORMAL) USER EDITABLE PART
+################################################################################
 
+# note the location for later use (eg, in job scripts)
 if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 
+# The old dirs to be cleaned from the various environment variables
+# - remove anything under top-level directory.
+# NB: the WM_PROJECT_INST_DIR might not be identical between versions
+set foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$LOGNAME"
 
 # Location of site/user files
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -165,8 +175,8 @@ default:
 endsw
 
 
-# Clean standard environment variables (path, PATH, MANPATH, LD_LIBRARY_PATH)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Clean standard environment variables (path/PATH, LD_LIBRARY_PATH, MANPATH)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 set cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
 
 if (! $?LD_LIBRARY_PATH ) then
@@ -176,21 +186,18 @@ if (! $?MANPATH) then
     setenv MANPATH ''
 endif
 
-# Remove anything under top-level foam directory
-set wildCards="$WM_PROJECT_INST_DIR $HOME/$WM_PROJECT/$LOGNAME"
-
 #- Clean path/PATH
 set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set PATH=`$cleanProg "$colonPath" "$wildCards"`
+set cleanEnv=`$cleanProg "$colonPath" "$foamOldDirs"`
 if ( $status == 0 ) then
-    set path=`echo "$PATH" | sed -e 's/:/ /g'`
+    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
 endif
 
 #- Clean LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH" "$wildCards"`
+setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"`
 
 #- Clean MANPATH
-setenv MANPATH `$cleanProg "$MANPATH" "$wildCards"`
+setenv MANPATH `$cleanProg "$MANPATH" "$foamOldDirs"`
 
 
 # Source project setup files
@@ -205,15 +212,16 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
 # _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
+# _foamSource $WM_PROJECT_DIR/etc/apps/cint/cshrc
 
 
-# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#- Clean path/PATH. Only remove duplicates
+# Clean environment paths again. Only remove duplicates
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#- Clean path/PATH
 set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set PATH=`$cleanProg "$colonPath"`
+set cleanEnv=`$cleanProg "$colonPath"`
 if ( $status == 0 ) then
-    set path=`echo "$PATH" | sed -e 's/:/ /g'`
+    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
 endif
 
 #- Clean LD_LIBRARY_PATH
@@ -229,8 +237,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanProg
-unset wildCards
-unset colonPath
+unset cleanEnv cleanProg colonPath foamInstall foamOldDirs
 unalias _foamSource
+
 # -----------------------------------------------------------------------------
diff --git a/src/Allwmake b/src/Allwmake
index e0324141cd..39ce3f16f1 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-# update Foam::FOAMversion string if required
+# update OpenFOAM version strings if required
 wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
 
 wmakeLnInclude -f OpenFOAM
diff --git a/src/OSspecific/Unix/Unix.C b/src/OSspecific/Unix/Unix.C
index fa92f10b27..e4ffe76857 100644
--- a/src/OSspecific/Unix/Unix.C
+++ b/src/OSspecific/Unix/Unix.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    UNIX versions of the functions declated in OSspecific.H.
+    UNIX versions of the functions declared in OSspecific.H.
 
 \*---------------------------------------------------------------------------*/
 
@@ -284,7 +284,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
 bool Foam::mkDir(const fileName& pathName, mode_t mode)
 {
     // empty names are meaningless
-    if (!pathName.size())
+    if (pathName.empty())
     {
         return false;
     }
@@ -491,7 +491,7 @@ bool Foam::dir(const fileName& name)
 
 
 // Return size of file
-off_t Foam::size(const fileName& name)
+off_t Foam::fileSize(const fileName& name)
 {
     fileStat fileStatus(name);
     if (fileStatus.isValid())
@@ -541,7 +541,7 @@ Foam::fileNameList Foam::readDir
     // Setup empty string list MAXTVALUES long
     fileNameList dirEntries(maxNnames);
 
-    // Pointers to the Unix director system
+    // Pointers to the directory entries
     DIR *source;
     struct dirent *list;
 
@@ -567,10 +567,10 @@ Foam::fileNameList Foam::readDir
         {
             fileName fName(list->d_name);
 
-            // ignore files begining with ., i.e. ., .. and .??*
-            if (fName.size() > 0 && fName[size_t(0)] != '.')
+            // ignore files begining with ., i.e. '.', '..' and '.*'
+            if (fName.size() && fName[0] != '.')
             {
-                word fileNameExt = fName.ext();
+                word fExt = fName.ext();
 
                 if
                 (
@@ -578,11 +578,11 @@ Foam::fileNameList Foam::readDir
                  ||
                     (
                         type == fileName::FILE
-                        && fName[fName.size()-1] != '~'
-                        && fileNameExt != "bak"
-                        && fileNameExt != "BAK"
-                        && fileNameExt != "old"
-                        && fileNameExt != "save"
+                     && fName[fName.size()-1] != '~'
+                     && fExt != "bak"
+                     && fExt != "BAK"
+                     && fExt != "old"
+                     && fExt != "save"
                     )
                 )
                 {
@@ -593,7 +593,7 @@ Foam::fileNameList Foam::readDir
                             dirEntries.setSize(dirEntries.size() + maxNnames);
                         }
 
-                        if (filtergz && fileNameExt == "gz")
+                        if (filtergz && fExt == "gz")
                         {
                             dirEntries[nEntries++] = fName.lessExt();
                         }
@@ -616,17 +616,17 @@ Foam::fileNameList Foam::readDir
 }
 
 
-// Copy, recursively if necessary, the source top the destination
+// Copy, recursively if necessary, the source to the destination
 bool Foam::cp(const fileName& src, const fileName& dest)
 {
-    fileName destFile(dest);
-
     // Make sure source exists.
     if (!exists(src))
     {
         return false;
     }
 
+    fileName destFile(dest);
+
     // Check type of source file.
     if (src.type() == fileName::FILE)
     {
@@ -676,7 +676,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
             destFile = destFile/src.component(src.components().size() -1);
         }
 
-        // Make sure the destination directory extists.
+        // Make sure the destination directory exists.
         if (!dir(destFile) && !mkDir(destFile))
         {
             return false;
@@ -806,7 +806,7 @@ bool Foam::rmDir(const fileName& directory)
             << "removing directory " << directory << endl;
     }
 
-    // Pointers to the Unix director system
+    // Pointers to the directory entries
     DIR *source;
     struct dirent *list;
 
diff --git a/src/OSspecific/Unix/printStack.C b/src/OSspecific/Unix/printStack.C
index f73c500735..a6c2743298 100644
--- a/src/OSspecific/Unix/printStack.C
+++ b/src/OSspecific/Unix/printStack.C
@@ -149,7 +149,7 @@ void getSymbolForRaw
     const word& address
 )
 {
-    if (filename.size() > 0 && filename[0] == '/')
+    if (filename.size() && filename[0] == '/')
     {
         string fcnt = pOpen
         (
@@ -189,7 +189,7 @@ void error::printStack(Ostream& os)
             string::size_type space = line.rfind(' ') + 1;
             fileName libPath = line.substr(space, line.size()-space);
 
-            if (libPath.size() > 0 && libPath[0] == '/')
+            if (libPath.size() && libPath[0] == '/')
             {
                 string offsetString(line.substr(0, line.find('-')));
                 IStringStream offsetStr(offsetString);
@@ -217,7 +217,7 @@ void error::printStack(Ostream& os)
             string::size_type lPos = msg.find('[');
             string::size_type rPos = msg.find(']');
 
-            if (lPos != string::npos && rPos != string::npos && lPos<rPos)
+            if (lPos != string::npos && rPos != string::npos && lPos < rPos)
             {
                 address = msg.substr(lPos+1, rPos-lPos-1);
                 msg = msg.substr(0, lPos);
@@ -232,7 +232,7 @@ void error::printStack(Ostream& os)
                 // not an absolute path
                 if (programFile[0] != '/')
                 {
-                    string tmp = pOpen("which "+programFile);
+                    string tmp = pOpen("which " + programFile);
                     if (tmp[0] == '/' || tmp[0] == '~')
                     {
                         programFile = tmp;
@@ -243,13 +243,13 @@ void error::printStack(Ostream& os)
 
         string::size_type bracketPos = msg.find('(');
 
-        if (bracketPos != string::size_type(string::npos))
+        if (bracketPos != string::npos)
         {
             string::size_type start = bracketPos+1;
 
             string::size_type plusPos = msg.find('+', start);
 
-            if (plusPos != string::size_type(string::npos))
+            if (plusPos != string::npos)
             {
                 string cName(msg.substr(start, plusPos-start));
 
@@ -276,7 +276,7 @@ void error::printStack(Ostream& os)
             {
                 string::size_type endBracketPos = msg.find(')', start);
 
-                if (endBracketPos != string::size_type(string::npos))
+                if (endBracketPos != string::npos)
                 {
                     string fullName(msg.substr(start, endBracketPos-start));
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index e452017d23..af3ea9c423 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -51,21 +51,15 @@ class Ostream;
 
 template<class T, class Key, class Hash> class HashPtrTable;
 
-template<class T, class Key, class Hash> Istream& operator>>
-(
-    Istream&,
-    HashPtrTable<T, Key, Hash>&
-);
+template<class T, class Key, class Hash>
+Istream& operator>>(Istream&, HashPtrTable<T, Key, Hash>&);
 
-template<class T, class Key, class Hash> Ostream& operator<<
-(
-    Ostream&,
-    const HashPtrTable<T, Key, Hash>&
-);
+template<class T, class Key, class Hash>
+Ostream& operator<<(Ostream&, const HashPtrTable<T, Key, Hash>&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class HashPtrTable Declaration
+                        Class HashPtrTable Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class T, class Key=word, class Hash=string::hash>
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index acb603bebd..2136916780 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -32,19 +32,19 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Key, class Hash>
-template<class T>
-Foam::HashSet<Key, Hash>::HashSet(const HashTable<T, Key, Hash>& ht)
+template<class AnyType>
+Foam::HashSet<Key, Hash>::HashSet(const HashTable<AnyType, Key, Hash>& ht)
 :
-    HashTable<empty, Key, Hash>(ht.size())
+    HashTable<nil, Key, Hash>(ht.size())
 {
     for
     (
-        typename HashTable<T, Key, Hash>::const_iterator iter = ht.begin();
-        iter != ht.end();
-        ++iter
+        typename HashTable<AnyType, Key, Hash>::const_iterator cit = ht.begin();
+        cit != ht.end();
+        ++cit
     )
     {
-        insert(iter.key());
+        insert(cit.key());
     }
 }
 
@@ -126,6 +126,7 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
 }
 
 
+// same as HashTable::erase()
 template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
 {
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 889ede7a7d..ad45dc9540 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -46,7 +46,7 @@ Description
 #define HashSet_H
 
 #include "HashTable.H"
-#include "empty.H"
+#include "nil.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,13 +60,13 @@ namespace Foam
 template<class Key=word, class Hash=string::hash>
 class HashSet
 :
-    public HashTable<empty, Key, Hash>
+    public HashTable<nil, Key, Hash>
 {
 
 public:
 
-    typedef typename HashTable<empty, Key, Hash>::iterator iterator;
-    typedef typename HashTable<empty, Key, Hash>::const_iterator const_iterator;
+    typedef typename HashTable<nil, Key, Hash>::iterator iterator;
+    typedef typename HashTable<nil, Key, Hash>::const_iterator const_iterator;
 
 
     // Constructors
@@ -74,19 +74,19 @@ public:
         //- Construct given initial size
         HashSet(label size = 100)
         :
-            HashTable<empty, Key, Hash>(size)
+            HashTable<nil, Key, Hash>(size)
         {}
 
         //- Construct from Istream
         HashSet(Istream& is)
         :
-            HashTable<empty, Key, Hash>(is)
+            HashTable<nil, Key, Hash>(is)
         {}
 
         //- Construct from UList of Key
         HashSet(const UList<Key>& lst)
         :
-            HashTable<empty, Key, Hash>(2*lst.size())
+            HashTable<nil, Key, Hash>(2*lst.size())
         {
             forAll(lst, i)
             {
@@ -97,24 +97,25 @@ public:
         //- Construct as copy
         HashSet(const HashSet<Key, Hash>& hs)
         :
-            HashTable<empty, Key, Hash>(hs)
+            HashTable<nil, Key, Hash>(hs)
         {}
 
         //- Construct by transferring the parameter contents
         HashSet(const Xfer<HashSet<Key, Hash> >& hs)
         :
-            HashTable<empty, Key, Hash>(hs)
+            HashTable<nil, Key, Hash>(hs)
         {}
 
         //- Construct by transferring the parameter contents
-        HashSet(const Xfer<HashTable<empty, Key, Hash> >& hs)
+        HashSet(const Xfer<HashTable<nil, Key, Hash> >& hs)
         :
-            HashTable<empty, Key, Hash>(hs)
+            HashTable<nil, Key, Hash>(hs)
         {}
 
-        //- Construct from table of contents of the HashTable
-        template<class T>
-        HashSet(const HashTable<T, Key, Hash>& ht);
+        //- Construct from the keys of another HashTable,
+        //  the type of values held is arbitrary.
+        template<class AnyType>
+        HashSet(const HashTable<AnyType, Key, Hash>&);
 
     // Member Functions
 
@@ -123,13 +124,13 @@ public:
         //- Insert a new entry
         bool insert(const Key& key)
         {
-            return HashTable<empty, Key, Hash>::insert(key, empty());
+            return HashTable<nil, Key, Hash>::insert(key, nil());
         }
 
-        //- Same as insert (cannot overwrite empty content)
+        //- Same as insert (cannot overwrite nil content)
         bool set(const Key& key)
         {
-            return HashTable<empty, Key, Hash>::insert(key, empty());
+            return HashTable<nil, Key, Hash>::insert(key, nil());
         }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 5daf0eb6fe..ae9bcc2718 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -388,11 +388,11 @@ bool Foam::HashTable<T, Key, Hash>::erase(const iterator& cit)
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 {
-    iterator it = find(key);
+    iterator fnd = find(key);
 
-    if (it != end())
+    if (fnd != end())
     {
-        return erase(it);
+        return erase(fnd);
     }
     else
     {
@@ -401,6 +401,53 @@ bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::label Foam::HashTable<T, Key, Hash>::erase(const UList<Key>& keys)
+{
+    label count = 0;
+
+    // Remove listed keys from this table
+    if (this->size())
+    {
+        forAll(keys, keyI)
+        {
+            if (erase(keys[keyI]))
+            {
+                count++;
+            }
+        }
+    }
+
+    return count;
+}
+
+
+template<class T, class Key, class Hash>
+template<class AnyType>
+Foam::label Foam::HashTable<T, Key, Hash>::erase
+(
+    const HashTable<AnyType, Key, Hash>& rhs
+)
+{
+    label count = 0;
+
+    // Remove rhs elements from this table
+    if (this->size())
+    {
+        // NOTE: could further optimize depending on which hash is smaller
+        for (iterator iter = begin(); iter != end(); ++iter)
+        {
+            if (rhs.found(iter.key()) && erase(iter))
+            {
+                count++;
+            }
+        }
+    }
+
+    return count;
+}
+
+
 template<class T, class Key, class Hash>
 void Foam::HashTable<T, Key, Hash>::resize(const label newSize)
 {
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index a7319c833f..2fbb548d0e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -51,20 +51,15 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 template<class T> class List;
+template<class T> class UList;
 template<class T, class Key, class Hash> class HashTable;
 template<class T, class Key, class Hash> class HashPtrTable;
 
-template<class T, class Key, class Hash> Istream& operator>>
-(
-    Istream&,
-    HashTable<T, Key, Hash>&
-);
+template<class T, class Key, class Hash>
+Istream& operator>>(Istream&, HashTable<T, Key, Hash>&);
 
-template<class T, class Key, class Hash> Ostream& operator<<
-(
-    Ostream&,
-    const HashTable<T, Key, Hash>&
-);
+template<class T, class Key, class Hash>
+Ostream& operator<<(Ostream&, const HashTable<T, Key, Hash>&);
 
 
 /*---------------------------------------------------------------------------*\
@@ -171,6 +166,9 @@ public:
             //- Return number of elements in table.
             inline label size() const;
 
+            //- Return true if the hash table is empty
+            inline bool empty() const;
+
             //- Return true if hashedEntry is found in table
             bool found(const Key&) const;
 
@@ -200,6 +198,17 @@ public:
             //- Erase an hashedEntry specified by given key if in table
             bool erase(const Key&);
 
+            //- Remove entries given by the listed keys from this HashTable
+            //  Return the number of elements removed
+            label erase(const UList<Key>&);
+
+            //- Remove entries given by the given keys from this HashTable
+            //  Return the number of elements removed.
+            //  The parameter HashTable needs the same type of keys, but
+            //  but the type of values held is arbitrary.
+            template<class AnyType>
+            label erase(const HashTable<AnyType, Key, Hash>&);
+
             //- Resize the hash table for efficiency
             void resize(const label newSize);
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 8762d12a9a..03359b2fd1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -51,6 +51,13 @@ inline Foam::label Foam::HashTable<T, Key, Hash>::size() const
 }
 
 
+template<class T, class Key, class Hash>
+inline bool Foam::HashTable<T, Key, Hash>::empty() const
+{
+    return (nElmts_ == 0);
+}
+
+
 template<class T, class Key, class Hash>
 inline bool Foam::HashTable<T, Key, Hash>::insert
 (
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 50d8ff5763..3ba659c83d 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -346,6 +346,28 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const Key& key)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::label Foam::StaticHashTable<T, Key, Hash>::erase
+(
+    const StaticHashTable<T, Key, Hash>& rhs
+)
+{
+    label count = 0;
+
+    // Remove rhs elements from this table
+    // NOTE: could optimize depending on which hash is smaller
+    for (iterator iter = this->begin(); iter != this->end(); ++iter)
+    {
+        if (rhs.found(iter.key()) && erase(iter))
+        {
+            count++;
+        }
+    }
+
+   return count;
+}
+
+
 template<class T, class Key, class Hash>
 void Foam::StaticHashTable<T, Key, Hash>::resize(const label newSize)
 {
@@ -454,8 +476,8 @@ void Foam::StaticHashTable<T, Key, Hash>::operator=
     }
 
 
-    // could be zero-sized from a previous transfer()
-    if (keys_.size() == 0)
+    // keys could be empty from a previous transfer()
+    if (keys_.empty())
     {
         keys_.setSize(rhs.keys_.size());
         objects_.setSize(keys_.size());
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index 95df9befce..2816056383 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -164,6 +164,9 @@ public:
             //- Return number of elements in table.
             inline label size() const;
 
+            //- Return true if the hash table is empty
+            inline bool empty() const;
+
             //- Return true if hashed entry is found in table
             bool found(const Key& key) const;
 
@@ -196,6 +199,10 @@ public:
             //- Resize the hash table for efficiency
             void resize(const label newSize);
 
+            //- Remove entries in the given hash table from this hash table
+            //  Return the number of elements removed
+            label erase(const StaticHashTable<T, Key, Hash>&);
+
             //- Clear all entries from table
             void clear();
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 104cbbf3fe..d9bfaae0b8 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -38,6 +38,13 @@ inline Foam::label Foam::StaticHashTable<T, Key, Hash>::size() const
 }
 
 
+template<class T, class Key, class Hash>
+inline bool Foam::StaticHashTable<T, Key, Hash>::empty() const
+{
+    return (nElmts_ == 0);
+}
+
+
 template<class T, class Key, class Hash>
 inline bool Foam::StaticHashTable<T, Key, Hash>::insert
 (
@@ -321,7 +328,7 @@ Foam::StaticHashTable<T, Key, Hash>::begin()
     // Find first non-empty entry
     forAll(keys_, hashIdx)
     {
-        if (keys_[hashIdx].size() > 0)
+        if (keys_[hashIdx].size())
         {
             return iterator(*this, hashIdx, 0);
         }
@@ -353,7 +360,7 @@ Foam::StaticHashTable<T, Key, Hash>::begin() const
     // Find first non-empty entry
     forAll(keys_, hashIdx)
     {
-        if (keys_[hashIdx].size() > 0)
+        if (keys_[hashIdx].size())
         {
             return const_iterator(*this, hashIdx, 0);
         }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 33d55e3186..475109cc77 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -122,6 +122,9 @@ public:
             //- Return number of elements in list
             inline label size() const;
 
+            //- Return true if the list is empty
+            inline bool empty() const;
+
             //- Return first entry
             inline link* first();
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
index e30902ce50..6692ce5c52 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
@@ -81,6 +81,12 @@ inline Foam::label Foam::DLListBase::size() const
 }
 
 
+inline bool Foam::DLListBase::empty() const
+{
+    return (nElmts_ == 0);
+}
+
+
 inline Foam::DLListBase::link*
 Foam::DLListBase::first()
 {
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index 4102dee336..06f5960fae 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -119,6 +119,9 @@ public:
             //- Return number of elements in list
             inline label size() const;
 
+            //- Return true if the list is empty
+            inline bool empty() const;
+
             //- Return first entry
             inline link* first();
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
index 2d84028e6c..ca069a239d 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
@@ -71,6 +71,12 @@ inline Foam::label Foam::SLListBase::size() const
 }
 
 
+inline bool Foam::SLListBase::empty() const
+{
+    return (nElmts_ == 0);
+}
+
+
 inline Foam::SLListBase::link*
 Foam::SLListBase::first()
 {
diff --git a/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H b/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H
index 04a6791f24..a07b94cbcc 100644
--- a/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H
+++ b/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H
@@ -92,15 +92,6 @@ public:
             }
 
 
-        // Check
-
-            //- Is the stack empty
-            bool empty() const
-            {
-                return this->size() == 0;
-            }
-
-
         // Edit
 
             //- Push an element onto the stack
diff --git a/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H b/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H
index b8bcde265c..9e60f35f77 100644
--- a/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H
+++ b/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H
@@ -92,15 +92,6 @@ public:
             }
 
 
-        // Check
-
-            //- Is the stack empty
-            bool empty() const
-            {
-                return this->size() == 0;
-            }
-
-
         // Edit
 
             //- Push an element onto the stack
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 6e60d13d8a..a7827ec6cb 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -75,6 +75,8 @@ public:
         // Access
 
             inline label size() const;
+            inline bool  empty() const;
+
             inline const UList<T>& posList() const;
             inline const UList<T>& negList() const;
             inline const List<label>& addressing() const;
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index 8425cb980d..b30769d107 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -49,6 +49,13 @@ inline Foam::label Foam::BiIndirectList<T>::size() const
 }
 
 
+template<class T>
+inline bool Foam::BiIndirectList<T>::empty() const
+{
+    return addressing_.empty();
+}
+
+
 template<class T>
 inline const Foam::UList<T>& Foam::BiIndirectList<T>::posList() const
 {
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 91a6729706..7cf9e31669 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -126,6 +126,9 @@ public:
             //- Return the primary size, i.e. the number of rows
             inline label size() const;
 
+            //- Return true if the number of rows is zero
+            inline bool empty() const;
+
             //- Return the offset table
             inline const List<label>& offsets() const;
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 851609ba7c..e2e794356e 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -74,6 +74,13 @@ inline Foam::label Foam::CompactListList<T>::size() const
 }
 
 
+template<class T>
+inline bool Foam::CompactListList<T>::empty() const
+{
+    return offsets_.empty();
+}
+
+
 template<class T>
 inline const Foam::List<Foam::label>& Foam::CompactListList<T>::offsets() const
 {
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 18affc9d06..776d7b65db 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -69,6 +69,8 @@ public:
         // Access
 
             inline label size() const;
+            inline bool  empty() const;
+
             inline const UList<T>& completeList() const;
             inline const List<label>& addressing() const;
 
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index 94a8bbf4b3..0ae5311d97 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -47,6 +47,13 @@ inline Foam::label Foam::IndirectList<T>::size() const
 }
 
 
+template<class T>
+inline bool Foam::IndirectList<T>::empty() const
+{
+    return addressing_.empty();
+}
+
+
 template<class T>
 inline const Foam::UList<T>& Foam::IndirectList<T>::completeList() const
 {
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index ea75d13eda..d2d015ad56 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -166,6 +166,9 @@ public:
             //- Number of packed elements
             inline label size() const;
 
+            //- Return true if the list is empty (i.e., if size() == 0).
+            inline bool empty() const;
+
             //- Get value at index I
             inline unsigned int get(const label i) const;
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 809ae08ab5..dc5f18786e 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -117,6 +117,13 @@ inline Foam::label Foam::PackedList<nBits>::size() const
 }
 
 
+template<int nBits>
+inline bool Foam::PackedList<nBits>::empty() const
+{
+    return (size_ == 0);
+}
+
+
 // Get value at i
 template<int nBits>
 inline unsigned int Foam::PackedList<nBits>::get(const label i) const
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index b90f0f0b6f..86c7ea8f4d 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -158,6 +158,9 @@ public:
             //- Return the number of elements in the PtrList
             inline label size() const;
 
+            //- Return true if the PtrList is empty (i.e., if size() == 0).
+            inline bool empty() const;
+
 
         // Edit
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index fe983406cf..8dfbe2686a 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -38,6 +38,13 @@ inline Foam::label Foam::PtrList<T>::size() const
 }
 
 
+template<class T>
+inline bool Foam::PtrList<T>::empty() const
+{
+    return ptrs_.empty();
+}
+
+
 template<class T>
 inline bool Foam::PtrList<T>::set(const label i) const
 {
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index c7cf618589..9f923d8fce 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -52,7 +52,7 @@ Foam::IOobjectList::IOobjectList
     {
         newInstance = db.time().findInstancePath(instant(instance));
 
-        if (!newInstance.size())
+        if (newInstance.empty())
         {
             return;
         }
@@ -181,7 +181,7 @@ Foam::wordList Foam::IOobjectList::names() const
 {
     wordList objectNames(size());
 
-    label count=0;
+    label count = 0;
     for
     (
         HashPtrTable<IOobject>::const_iterator iter = begin();
@@ -200,7 +200,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
 {
     wordList objectNames(size());
 
-    label count=0;
+    label count = 0;
     for
     (
         HashPtrTable<IOobject>::const_iterator iter = begin();
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index 18cf8b891a..b4be5d37fe 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -42,7 +42,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
     ifPtr_(NULL),
     compression_(IOstream::UNCOMPRESSED)
 {
-    if (!pathname.size())
+    if (pathname.empty())
     {
         if (IFstream::debug)
         {
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index b78e5f07de..bc6c2a03cc 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -46,7 +46,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
 :
     ofPtr_(NULL)
 {
-    if (!pathname.size())
+    if (pathname.empty())
     {
         if (OFstream::debug)
         {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
index bb4258af11..8e754ce2fd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
@@ -136,18 +136,18 @@ Foam::Ostream& Foam::OPstream::write(const char* str)
 {
     word nonWhiteChars(string::validate<word>(str));
 
-    if (nonWhiteChars.size() == 0)
-    {
-        return *this;
-    }
-    else if (nonWhiteChars.size() == 1)
+    if (nonWhiteChars.size() == 1)
     {
         return write(nonWhiteChars.c_str()[1]);
     }
-    else
+    else if (nonWhiteChars.size())
     {
         return write(nonWhiteChars);
     }
+    else
+    {
+        return *this;
+    }
 }
 
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 01ed2e67aa..8b91422fac 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -236,7 +236,7 @@ Foam::List<Foam::instant> Foam::timeSelector::select0
 {
     instantList timeDirs = timeSelector::select(runTime.times(), args);
 
-    if (!timeDirs.size())
+    if (timeDirs.empty())
     {
         FatalErrorIn(args.executable())
             << "No times selected"
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 27a4dcc1bb..8acc6e71ff 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -46,7 +46,7 @@ bool Foam::dictionary::findInPatterns
     DLList<autoPtr<regExp> >::const_iterator& reLink
 ) const
 {
-    if (patternEntries_.size() > 0)
+    if (patternEntries_.size())
     {
         while (wcLink != patternEntries_.end())
         {
@@ -76,7 +76,7 @@ bool Foam::dictionary::findInPatterns
     DLList<autoPtr<regExp> >::iterator& reLink
 )
 {
-    if (patternEntries_.size() > 0)
+    if (patternEntries_.size())
     {
         while (wcLink != patternEntries_.end())
         {
@@ -240,7 +240,7 @@ bool Foam::dictionary::found(const word& keyword, bool recursive) const
     }
     else
     {
-        if (patternEntries_.size() > 0)
+        if (patternEntries_.size())
         {
             DLList<entry*>::const_iterator wcLink = patternEntries_.begin();
             DLList<autoPtr<regExp> >::const_iterator reLink =
@@ -276,7 +276,7 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
 
     if (iter == hashedEntries_.end())
     {
-        if (patternMatch && patternEntries_.size() > 0)
+        if (patternMatch && patternEntries_.size())
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
@@ -315,7 +315,7 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
 
     if (iter == hashedEntries_.end())
     {
-        if (patternMatch && patternEntries_.size() > 0)
+        if (patternMatch && patternEntries_.size())
         {
             DLList<entry*>::iterator wcLink =
                 patternEntries_.begin();
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 257876eed5..be5977ee06 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -113,15 +113,19 @@ Foam::dictionary& Foam::primitiveEntry::dict()
 }
 
 
-void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
+void Foam::primitiveEntry::insert
+(
+    const tokenList& varTokens,
+    const label posI
+)
 {
     tokenList& tokens = *this;
 
-    if (!varTokens.size())
+    if (varTokens.empty())
     {
         label end = tokens.size() - 1;
 
-        for(label j=i; j<end; j++)
+        for (label j=posI; j<end; j++)
         {
             tokens[j] = tokens[j+1];
         }
@@ -135,7 +139,7 @@ void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
         label end = tokens.size() - 1;
         label offset = varTokens.size() - 1;
 
-        for(label j=end; j>i; j--)
+        for (label j=end; j>posI; j--)
         {
             tokens[j] = tokens[j-offset];
         }
@@ -143,7 +147,7 @@ void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
 
     forAll(varTokens, j)
     {
-        tokens[i + j] = varTokens[j];
+        tokens[posI + j] = varTokens[j];
     }
 }
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 93f1534ff1..c5189c1520 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -58,7 +58,7 @@ namespace Foam
 class dictionary;
 
 /*---------------------------------------------------------------------------*\
-                           Class primitiveEntry Declaration
+                       Class primitiveEntry Declaration
 \*---------------------------------------------------------------------------*/
 
 class primitiveEntry
@@ -99,8 +99,8 @@ public:
         //- Read the complete entry from the given stream
         void readEntry(const dictionary&, Istream&);
 
-        //- Insert the given tokens at token i
-        void insert(const tokenList&, const label i);
+        //- Insert the given tokens at token posI
+        void insert(const tokenList&, const label posI);
 
 
 public:
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 98b9c9dd1b..1ca027b247 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -55,7 +55,7 @@ bool regIOobject::writeObject
         return false;
     }
 
-    if (!instance().size())
+    if (instance().empty())
     {
         SeriousErrorIn("regIOobject::write()")
             << "instance undefined for object " << name()
diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H
index 6616a34036..c46c3d9ba1 100644
--- a/src/OpenFOAM/db/typeInfo/className.H
+++ b/src/OpenFOAM/db/typeInfo/className.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Macro definitions for declaring ClassName()
+    Macro definitions for declaring ClassName(), NamespaceName(), etc.
 
 \*---------------------------------------------------------------------------*/
 
@@ -35,59 +35,157 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Adds typeName information from its argument @a TypeNameString to a class
-#define ClassName(TypeNameString)                                             \
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// declarations (without debug information)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+//- Add typeName information from argument @a TypeNameString to a class.
+//  Without debug information
+#define ClassNameNoDebug(TypeNameString)                                      \
     static const char* typeName_() { return TypeNameString; }                 \
-    static const ::Foam::word typeName;                                       \
-    static int debug
+    static const ::Foam::word typeName;
 
-#define NamespaceName(TypeNameString)                                         \
+//- Add typeName information from argument @a TypeNameString to a namespace.
+//  Without debug information.
+#define NamespaceNameNoDebug(TypeNameString)                                  \
     inline const char* typeName_() { return TypeNameString; }                 \
-    extern const ::Foam::word typeName;                                       \
-    extern int debug
+    extern const ::Foam::word typeName;
 
-#define TemplateName(template)                                                \
-class template##Name                                                          \
+//- Add typeName information from argument @a TemplateNameString to a template class.
+//  Without debug information.
+#define TemplateNameNoDebug(TemplateNameString)                               \
+class TemplateNameString##Name                                                \
 {                                                                             \
 public:                                                                       \
-                                                                              \
-    template##Name()                                                          \
-    {}                                                                        \
-                                                                              \
-    ClassName(#template);                                                     \
+    TemplateNameString##Name() {}                                             \
+    ClassNameNoDebug(#TemplateNameString);                                    \
 };
 
 
-#define defineTypeNameAndDebug(Type, DebugSwitch)                             \
-    const ::Foam::word Type::typeName(Type::typeName_());                     \
-    int Type::debug(::Foam::debug::debugSwitch(Type::typeName_(), DebugSwitch));
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// declarations (with debug information)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+//- Add typeName information from argument @a TypeNameString to a class.
+//  Also declares debug information.
+#define ClassName(TypeNameString)                                             \
+    ClassNameNoDebug(TypeNameString);                                         \
+    static int debug
+
+//- Add typeName information from argument @a TypeNameString to a namespace.
+//  Also declares debug information.
+#define NamespaceName(TypeNameString)                                         \
+    NamespaceNameNoDebug(TypeNameString);                                     \
+    extern int debug
+
+//- Add typeName information from argument @a TypeNameString to a template class.
+//  Also declares debug information.
+#define TemplateName(TemplateNameString)                                      \
+class TemplateNameString##Name                                                \
+{                                                                             \
+public:                                                                       \
+    TemplateNameString##Name() {}                                             \
+    ClassName(#TemplateNameString);                                           \
+};
+
+
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// definitions (without debug information)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+//- Define the typeName, with alternative lookup as @a Name
+#define defineTypeNameWithName(Type, Name)                                    \
+    const ::Foam::word Type::typeName(Name);
+
+//- Define the typeName
+#define defineTypeName(Type)                                                  \
+    defineTypeNameWithName(Type, Type::typeName_());
 
 #ifdef __INTEL_COMPILER
-#define defineTemplateTypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
-    const ::Foam::word Type::typeName(Name);                                  \
-    int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch));
+//- Define the typeName as @a Name for template classes
+# define defineTemplateTypeNameWithName(Type, Name)                           \
+    defineTypeNameWithName(Type, Name);
 #else
-#define defineTemplateTypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
+//- Define the typeName as @a Name for template classes
+# define defineTemplateTypeNameWithName(Type, Name)                           \
     template<>                                                                \
-    const ::Foam::word Type::typeName(Name);                                  \
-    template<>                                                                \
-    int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch));
+    defineTypeNameWithName(Type, Name);
 #endif
 
+//- Define the typeName for template classes, useful with typedefs
+#define defineTemplateTypeName(Type)                                          \
+    defineTemplateTypeNameWithName(Type, #Type);
+
+//- Define the typeName directly for template classes
+#define defineNamedTemplateTypeName(Type)                                     \
+    defineTemplateTypeNameWithName(Type, Type::typeName_());
+
+
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// definitions (debug information only)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+//- Define the debug information, lookup as @a Name
+#define defineDebugSwitchWithName(Type, Name, DebugSwitch)                    \
+    int Type::debug(::Foam::debug::debugSwitch(Name, DebugSwitch));
+
+//- Define the debug information
+#define defineDebugSwitch(Type, DebugSwitch)                                  \
+    defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch);
+
+#ifdef __INTEL_COMPILER
+//- Define the debug information for templates, lookup as @a Name
+# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch);
+#else
+//- Define the debug information for templates, lookup as @a Name
+# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch)           \
+    template<>                                                                \
+    defineDebugSwitchWithName(Type, Name, DebugSwitch);
+#endif
+
+//- Define the debug information for templates
+//  Useful with typedefs
+#define defineTemplateDebugSwitch(Type, DebugSwitch)                          \
+    defineTemplateDebugSwitchWithName(Type, #Type, DebugSwitch);
+
+//- Define the debug information directly for templates
+#define defineNamedTemplateDebugSwitch(Type, DebugSwitch)                     \
+    defineTemplateDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch);
+
+
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// definitions (with debug information)
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+//- Define the typeName and debug information
+#define defineTypeNameAndDebug(Type, DebugSwitch)                             \
+    defineTypeName(Type);                                                     \
+    defineDebugSwitch(Type, DebugSwitch);
+
+//- Define the typeName and debug information, lookup as @a Name
+#define defineTemplateTypeNameAndDebugWithName(Type, Name, DebugSwitch)       \
+    defineTemplateTypeNameWithName(Type, Name);                               \
+    defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch);
+
+//- Define the typeName and debug information for templates, useful with typedefs
 #define defineTemplateTypeNameAndDebug(Type, DebugSwitch)                     \
     defineTemplateTypeNameAndDebugWithName(Type, #Type, DebugSwitch);
 
-#ifdef __INTEL_COMPILER
+//- Define the typeName and debug information for templates
 #define defineNamedTemplateTypeNameAndDebug(Type, DebugSwitch)                \
-    const ::Foam::word Type::typeName(Type::typeName_());                     \
-    int Type::debug(::Foam::debug::debugSwitch(Type::typeName_(), DebugSwitch));
-#else
-#define defineNamedTemplateTypeNameAndDebug(Type, DebugSwitch)                \
-    template<>                                                                \
-    const ::Foam::word Type::typeName(Type::typeName_());                     \
-    template<>                                                                \
-    int Type::debug(::Foam::debug::debugSwitch(Type::typeName_(), DebugSwitch));
-#endif
+    defineNamedTemplateTypeName(Type);                                        \
+    defineNamedTemplateDebugSwitch(Type, DebugSwitch);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
index b0dbe7090d..88320bcfe1 100644
--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
+++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
@@ -60,21 +60,28 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
+// declarations (for use in header files)
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//- Declare a ClassNameNoDebug() with extra virtual type info
+#define TypeNameNoDebug(TypeNameString)                                       \
+    ClassNameNoDebug(TypeNameString);                                         \
+    virtual const word& type() const { return typeName; }
 
-#define TypeName(TypeNameString)                              \
-    ClassName(TypeNameString);                                \
+//- Declare a ClassName() with extra virtual type info
+#define TypeName(TypeNameString)                                              \
+    ClassName(TypeNameString);                                                \
     virtual const word& type() const { return typeName; }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Reference type cast template function wraps dynamic_cast to handle the
-// bad_cast exception and generate a FatalError.
-
+//- Reference type cast template function,
+//  wraps dynamic_cast to handle bad_cast exception and generate a FatalError.
 template<class To, class From>
 inline To& dynamicCast(From& r)
 {
@@ -94,6 +101,8 @@ inline To& dynamicCast(From& r)
 }
 
 
+//- Reference type cast template function.
+//  As per dynamicCast, but handles type names via the virtual type() method.
 template<class To, class From>
 inline To& refCast(From& r)
 {
@@ -113,6 +122,7 @@ inline To& refCast(From& r)
 }
 
 
+//- Check the typeid
 template<class TestType, class Type>
 inline bool isType(const Type& t)
 {
@@ -120,6 +130,7 @@ inline bool isType(const Type& t)
 }
 
 
+//- Check if a dynamic_cast to typeid is possible
 template<class TestType, class Type>
 inline bool isA(const Type& t)
 {
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 1336bc9eff..9e9cef28c9 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -155,6 +155,13 @@ Field<Type>::Field(Field<Type>& f, bool reUse)
 {}
 
 
+template<class Type>
+Field<Type>::Field(const Xfer<List<Type> >& f)
+:
+    List<Type>(f)
+{}
+
+
 template<class Type>
 Field<Type>::Field(const Xfer<Field<Type> >& f)
 :
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index ee4529d75e..a66af31c5d 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -114,6 +114,9 @@ public:
         //- Construct as copy of a UList<Type>
         explicit Field(const UList<Type>&);
 
+        //- Construct by transferring the List contents
+        explicit Field(const Xfer<List<Type> >&);
+
         //- Construct by 1 to 1 mapping from the given field
         Field
         (
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 062735bf26..a157dee0a0 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -50,7 +50,7 @@ UNARY_FUNCTION(symmTensor, symmTensor, cof)
 
 void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
 {
-    if (!tf.size())
+    if (tf.empty())
     {
         return;
     }
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 5596d1fdd7..a2dbccb3fc 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -49,7 +49,7 @@ UNARY_FUNCTION(tensor, tensor, cof)
 
 void inv(Field<tensor>& tf, const UList<tensor>& tf1)
 {
-    if (!tf.size())
+    if (tf.empty())
     {
         return;
     }
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C
index 305951199b..f1e8021603 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.C
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.C
@@ -30,43 +30,52 @@ License
 #include "OFstream.H"
 #include "Pstream.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-bool JobInfo::writeJobInfo(debug::infoSwitch("writeJobInfo", 0));
+bool Foam::JobInfo::writeJobInfo(Foam::debug::infoSwitch("writeJobInfo", 0));
+Foam::JobInfo Foam::jobInfo;
 
-JobInfo jobInfo;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
-JobInfo::JobInfo()
+Foam::JobInfo::JobInfo()
 :
-    runningJobsDir_(getEnv("FOAM_JOB_DIR")/"runningJobs"),
-    finishedJobsDir_(getEnv("FOAM_JOB_DIR")/"finishedJobs"),
-    jobFileName_(hostName() + '.' + Foam::name(pid())),
-    runningJobPath_(runningJobsDir_/jobFileName_),
-    finishedJobPath_(finishedJobsDir_/jobFileName_)
+    runningJobPath_(),
+    finishedJobPath_(),
+    cpuTime_()
 {
     name() = "JobInfo";
 
     if (writeJobInfo && Pstream::master())
     {
-        if (!dir(runningJobsDir_) && !mkDir(runningJobsDir_))
+        string baseDir = getEnv("FOAM_JOB_DIR");
+        string jobFile = hostName() + '.' + Foam::name(pid());
+
+        fileName runningDir(baseDir/"runningJobs");
+        fileName finishedDir(baseDir/"finishedJobs");
+
+        runningJobPath_  = runningDir/jobFile;
+        finishedJobPath_ = finishedDir/jobFile;
+
+        if (baseDir.empty())
         {
             FatalErrorIn("JobInfo::JobInfo()")
-                << "Cannot make JobInfo directory " << runningJobsDir_
+                << "Cannot get JobInfo directory $FOAM_JOB_DIR"
                 << Foam::exit(FatalError);
         }
 
-        if (!dir(finishedJobsDir_) && !mkDir(finishedJobsDir_))
+        if (!dir(runningDir) && !mkDir(runningDir))
         {
             FatalErrorIn("JobInfo::JobInfo()")
-                << "Cannot make JobInfo directory " << finishedJobsDir_
+                << "Cannot make JobInfo directory " << runningDir
+                << Foam::exit(FatalError);
+        }
+
+        if (!dir(finishedDir) && !mkDir(finishedDir))
+        {
+            FatalErrorIn("JobInfo::JobInfo()")
+                << "Cannot make JobInfo directory " << finishedDir
                 << Foam::exit(FatalError);
         }
     }
@@ -77,7 +86,7 @@ JobInfo::JobInfo()
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-JobInfo::~JobInfo()
+Foam::JobInfo::~JobInfo()
 {
     if (writeJobInfo && constructed && Pstream::master())
     {
@@ -90,13 +99,13 @@ JobInfo::~JobInfo()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool JobInfo::write(Ostream& JobInfoFile) const
+bool Foam::JobInfo::write(Ostream& os) const
 {
     if (writeJobInfo && Pstream::master())
     {
-        if (JobInfoFile.good())
+        if (os.good())
         {
-            dictionary::write(JobInfoFile, false);
+            dictionary::write(os, false);
             return true;
         }
         else
@@ -111,7 +120,7 @@ bool JobInfo::write(Ostream& JobInfoFile) const
 }
 
 
-void JobInfo::write() const
+void Foam::JobInfo::write() const
 {
     if (writeJobInfo && Pstream::master())
     {
@@ -126,7 +135,7 @@ void JobInfo::write() const
 }
 
 
-void JobInfo::end(const word& terminationType)
+void Foam::JobInfo::end(const word& terminationType)
 {
     if (writeJobInfo && constructed && Pstream::master())
     {
@@ -147,25 +156,25 @@ void JobInfo::end(const word& terminationType)
 }
 
 
-void JobInfo::end()
+void Foam::JobInfo::end()
 {
     end("normal");
 }
 
 
-void JobInfo::exit()
+void Foam::JobInfo::exit()
 {
     end("exit");
 }
 
 
-void JobInfo::abort()
+void Foam::JobInfo::abort()
 {
     end("abort");
 }
 
 
-void JobInfo::signalEnd() const
+void Foam::JobInfo::signalEnd() const
 {
     if (writeJobInfo && constructed && Pstream::master())
     {
@@ -176,8 +185,4 @@ void JobInfo::signalEnd() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.H b/src/OpenFOAM/global/JobInfo/JobInfo.H
index f2c6c0e0b8..d37613e4d8 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.H
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.H
@@ -58,18 +58,13 @@ class JobInfo
     public dictionary
 {
     // Private data
-
-        fileName runningJobsDir_;
-        fileName finishedJobsDir_;
-        fileName jobFileName_;
         fileName runningJobPath_;
         fileName finishedJobPath_;
-
-        cpuTime cpuTime_;
+        cpuTime  cpuTime_;
 
     // Private member functions
 
-        bool write(Ostream& JobInfoFile) const;
+        bool write(Ostream&) const;
         void end(const word& terminationType);
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 23520fd087..a237c0256c 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -286,7 +286,8 @@ Foam::argList::argList
     if (Pstream::master() && bannerEnabled)
     {
         IOobject::writeBanner(Info, true);
-        Info<< "Exec   : " << argListString.c_str() << nl
+        Info<< "Build  : " << Foam::FOAMbuild << nl
+            << "Exec   : " << argListString.c_str() << nl            
             << "Date   : " << dateString.c_str() << nl
             << "Time   : " << timeString.c_str() << nl
             << "Host   : " << hostName() << nl
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index fbebf86bc4..f6f8a7c6de 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -35,6 +35,12 @@ Global
 Description
     OpenFOAM version number static string.
 
+Global
+    Foam::FOAMbuild
+
+Description
+    OpenFOAM version number static string with build information
+
 SourceFiles
     global.Cver
 
@@ -48,6 +54,7 @@ SourceFiles
 namespace Foam
 {
     extern const char* const FOAMversion;
+    extern const char* const FOAMbuild;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/global.Cver b/src/OpenFOAM/global/global.Cver
index 8bcd7e7728..677c30ecc7 100644
--- a/src/OpenFOAM/global/global.Cver
+++ b/src/OpenFOAM/global/global.Cver
@@ -28,14 +28,15 @@ Description
     avoid the use of unconstructed data in the global namespace.
 
     This file has the extension .Cver to trigger a Makefile rule that converts
-    WM_PROJECT_VERSION into the appropriate version string.
+    'VERSION\_STRING' and 'BUILD\_STRING' into the appropriate strings.
 
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #include "foamVersion.H"
 
-const char* const Foam::FOAMversion = "WM_PROJECT_VERSION";
+const char* const Foam::FOAMversion = "VERSION_STRING";
+const char* const Foam::FOAMbuild = "BUILD_STRING";
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Static initializers for string::null, word::null and fileName::null
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index df57346cf8..1cca34885d 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -26,7 +26,7 @@ InNamespace
     Foam
 
 Description
-    Functions used by OpenFOAM which are specific to the UNIX operating system
+    Functions used by OpenFOAM that are specific to the UNIX operating system
     and need to be replaced or emulated on other systems.
 
 SourceFiles
@@ -118,7 +118,7 @@ mode_t mode(const fileName&);
 //- Return the file type: FILE or DIRECTORY
 fileName::Type type(const fileName&);
 
-//- Does the name exist in the filing system?
+//- Does the name exist in the file system?
 bool exists(const fileName& name);
 
 //- Does the file exist?
@@ -128,7 +128,7 @@ bool file(const fileName&);
 bool dir(const fileName&);
 
 //- Return size of file
-off_t size(const fileName&);
+off_t fileSize(const fileName&);
 
 //- Return time of last file modification
 time_t lastModified(const fileName&);
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index 7d5a76ca72..534cb5e107 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -312,7 +312,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
             if
             (
                 m < directHitTol                            // Direct hit
-             || neighbours.size() == 0
+             || neighbours.empty()
             )
             {
                 faceWeights.set(faceI, new scalarField(1));
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 13ef29ed9b..23490b1547 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -308,7 +308,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             g = rv1[nm];
             scalar h = rv1[k];
             scalar f = ((y - z)*(y + z) + (g - h)*(g + h))/(2.0*h*y);
-            g = sqrtSumSqr(f, 1.0);
+            g = sqrtSumSqr(f, scalar(1));
             f = ((x - z)*(x + z) + h*((y/(f + sign(g, f))) - h))/x;
             scalar c = 1.0;
             s = 1.0;
diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H
index dc008bce9b..e255e28e7e 100644
--- a/src/OpenFOAM/memory/Xfer/XferI.H
+++ b/src/OpenFOAM/memory/Xfer/XferI.H
@@ -24,6 +24,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+template<class T>
+inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
+{
+    Xfer<T>* nullPtr = reinterpret_cast<Xfer<T>*>(0);
+    return *nullPtr;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
@@ -79,13 +89,6 @@ inline Foam::Xfer<T>::~Xfer()
 
 // * * * * * * * * * * * * *  Member Functions * * * * * * * * * * * * * * * //
 
-template<class T>
-inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
-{
-    Xfer<T>* nullPtr = reinterpret_cast<Xfer<T>*>(0);
-    return *nullPtr;
-}
-
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 04c2559537..c90898d055 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -77,37 +77,41 @@ public:
 
     // Member Functions
 
-        // Check
+    // Check
 
-            //- Is the autoPtr valid, i.e. is the pointer set
-            inline bool valid() const;
+        //- Return true if the autoPtr is empty (ie, no pointer set).
+        inline bool empty() const;
+
+        //- Return true if the autoPtr valid (ie, the pointer is set).
+        inline bool valid() const;
 
 
-        // Edit
+    // Edit
 
-            //- Return object pointer for reuse
-            inline T* ptr();
+        //- Return object pointer for reuse
+        inline T* ptr();
 
-            //- Set pointer to that given.
-            //  If object pointer already set issue a FatalError.
-            inline void set(T*);
+        //- Set pointer to that given.
+        //  If object pointer already set issue a FatalError.
+        inline void set(T*);
 
-            //- If object pointer already set delete object and
-            //  set pointer to that given
-            inline void reset(T* = 0);
+        //- If object pointer already set, delete object and set to given pointer
+        inline void reset(T* = 0);
 
-            //- If object pointer points to valid object:
-            //  delete object and set pointer to NULL
-            inline void clear();
+        //- Delete object and set pointer to NULL, if the pointer is valid.
+        inline void clear();
 
 
     // Member operators
 
+        //- Return reference to the object data
         inline T& operator()();
+
+        //- Return const reference to the object data
         inline const T& operator()() const;
 
-        //inline Tref operator*();
-        //inline const Tref operator*() const;
+        // inline T& operator*();
+        // inline const T& operator*() const;
 
         inline operator const T&() const;
 
@@ -117,6 +121,7 @@ public:
         //- Return const object pointer
         inline const T* operator->() const;
 
+        //- Take over object pointer from parameter
         inline void operator=(const autoPtr<T>&);
 };
 
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index e27d99b894..218acfe91a 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -53,6 +53,13 @@ inline Foam::autoPtr<T>::~autoPtr()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline bool Foam::autoPtr<T>::empty() const
+{
+    return !ptr_;
+}
+
+
 template<class T>
 inline bool Foam::autoPtr<T>::valid() const
 {
diff --git a/src/OpenFOAM/memory/tmp/refCount.H b/src/OpenFOAM/memory/tmp/refCount.H
index 60f4e6205c..d297997cb4 100644
--- a/src/OpenFOAM/memory/tmp/refCount.H
+++ b/src/OpenFOAM/memory/tmp/refCount.H
@@ -41,7 +41,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class refCount Declaration
+                          Class refCount Declaration
 \*---------------------------------------------------------------------------*/
 
 class refCount
@@ -63,6 +63,7 @@ public:
 
     // Constructors
 
+        //- Construct null with zero count
         refCount()
         :
             count_(0)
@@ -71,18 +72,21 @@ public:
 
     // Member Functions
 
+        //- Return the reference count
         int count() const
         {
             return count_;
         }
 
 
+        //- Return true if the reference count is zero
         bool okToDelete() const
         {
-            return(count_ == 0);
+            return (count_ == 0);
         }
 
 
+        //- Reset the reference count to zero
         void resetRefCount()
         {
             count_ = 0;
@@ -91,22 +95,25 @@ public:
 
     // Member Operators
 
+        //- Increment the reference count
         void operator++()
         {
             count_++;
         }
 
+        //- Increment the reference count
         void operator++(int)
         {
             count_++;
         }
 
-
+        //- Decrement the reference count
         void operator--()
         {
             count_--;
         }
 
+        //- Decrement the reference count
         void operator--(int)
         {
             count_--;
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 550217aaa0..a1aa88bec4 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -49,7 +49,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class tmp Declaration
+                             Class tmp Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class T>
@@ -91,11 +91,15 @@ public:
 
         // Access
 
-            //- Is this really a temporary object
+            //- Return true if this is really a temporary object
             inline bool isTmp() const;
 
-            //- Is this temporary object valid, i.e. is it a reference
-            //  or a temporary that has been allocated
+            //- Return true if this temporary object empty,
+            //  ie, a temporary without allocation
+            inline bool empty() const;
+
+            //- Is this temporary object valid,
+            //  ie, it is a reference or a temporary that has been allocated
             inline bool valid() const;
 
         // Edit
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 723c5aff56..39bc90fa9b 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -96,6 +96,13 @@ inline bool Foam::tmp<T>::isTmp() const
 }
 
 
+template<class T>
+inline bool Foam::tmp<T>::empty() const
+{
+    return (isTmp_ && !ptr_);
+}
+
+
 template<class T>
 inline bool Foam::tmp<T>::valid() const
 {
@@ -132,7 +139,7 @@ inline T* Foam::tmp<T>::ptr() const
 template<class T>
 inline void Foam::tmp<T>::clear() const
 {
-    if (isTmp_ && ptr_) // && ptr_->okToDelete())
+    if (isTmp_ && ptr_)  // skip this bit:  && ptr_->okToDelete())
     {
         delete ptr_;
         ptr_ = 0;
@@ -161,8 +168,11 @@ inline T& Foam::tmp<T>::operator()()
         // Note: const is cast away!
         // Perhaps there should be two refs, one for const and one for non const
         // and if the ref is actually const then you cannot return it here.
+        //
         // Another possibility would be to store a const ref and a flag to say
-        // wether the tmp was constructed with a const or a non-const argument.
+        // whether the tmp was constructed with a const or a non-const argument.
+        //
+        // eg, enum refType { POINTER = 0, REF = 1, CONSTREF = 2 };
         return const_cast<T&>(ref_);
     }
 }
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index e721118db2..bebfcb64fb 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -73,7 +73,7 @@ labelList bandCompression(const labelListList& cellCellAddressing)
             // neighbours. If the neighbour in question has not been visited,
             // add it to the end of the nextCell list
 
-            while (nextCell.size() > 0)
+            while (nextCell.size())
             {
                 currentCell = nextCell.removeHead();
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index 9ff80d26fa..15de6f2cf7 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -50,7 +50,7 @@ const Foam::boundBox Foam::boundBox::invertedBox
 
 void Foam::boundBox::calculate(const pointField& points, const bool doReduce)
 {
-    if (points.size() == 0)
+    if (points.empty())
     {
         min_ = point::zero;
         max_ = point::zero;
diff --git a/src/OpenFOAM/meshes/meshTools/matchPoints.C b/src/OpenFOAM/meshes/meshTools/matchPoints.C
index ad8726ea2b..826a0185b5 100644
--- a/src/OpenFOAM/meshes/meshTools/matchPoints.C
+++ b/src/OpenFOAM/meshes/meshTools/matchPoints.C
@@ -49,7 +49,7 @@ bool Foam::matchPoints
 
     if (origin == point(VGREAT, VGREAT, VGREAT))
     {
-        if (pts1.size() > 0)
+        if (pts1.size())
         {
             compareOrigin = sum(pts1)/pts1.size();
         }
diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C
index 19f544d64e..a4a82386b8 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.C
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C
@@ -44,7 +44,7 @@ bool Foam::mergePoints
 
     if (origin == point(VGREAT, VGREAT, VGREAT))
     {
-        if (points.size() > 0)
+        if (points.size())
         {
             compareOrigin = sum(points)/points.size();
         }
@@ -57,7 +57,7 @@ bool Foam::mergePoints
     // Storage for merged points
     newPoints.setSize(points.size());
 
-    if (points.size() == 0)
+    if (points.empty())
     {
         return false;
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 59b547490e..2cfd6e848c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -97,7 +97,7 @@ void Foam::pointMapper::calcAddressing() const
 
             label pointI = cfc[cfcI].index();
 
-            if (addr[pointI].size() > 0)
+            if (addr[pointI].size())
             {
                 FatalErrorIn("void pointMapper::calcAddressing() const")
                     << "Master point " << pointI
@@ -118,7 +118,7 @@ void Foam::pointMapper::calcAddressing() const
 
         forAll (cm, pointI)
         {
-            if (cm[pointI] > -1 && addr[pointI].size() == 0)
+            if (cm[pointI] > -1 && addr[pointI].empty())
             {
                 // Mapped from a single point
                 addr[pointI] = labelList(1, cm[pointI]);
@@ -135,7 +135,7 @@ void Foam::pointMapper::calcAddressing() const
 
         forAll (addr, pointI)
         {
-            if (addr[pointI].size() == 0)
+            if (addr[pointI].empty())
             {
                 // Mapped from a dummy point. Take point 0 with weight 1.
                 addr[pointI] = labelList(1, 0);
@@ -175,7 +175,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
     insertedPointLabelsPtr_(NULL)
 {
     // Check for possibility of direct mapping
-    if (mpm_.pointsFromPointsMap().size() == 0)
+    if (mpm_.pointsFromPointsMap().empty())
     {
         direct_ = true;
     }
@@ -185,7 +185,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
     }
 
     // Check for inserted points
-    if (direct_ && (mpm_.pointMap().size() == 0 || min(mpm_.pointMap()) > -1))
+    if (direct_ && (mpm_.pointMap().empty() || min(mpm_.pointMap()) > -1))
     {
         insertedPoints_ = false;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index b6b4bccf81..dc1930a5e0 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -86,7 +86,7 @@ void Foam::cellMapper::calcAddressing() const
 
         weightsPtr_ = new scalarListList(mesh_.nCells());
         scalarListList& w = *weightsPtr_;
-        
+
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
         forAll (cfp, cfpI)
@@ -96,7 +96,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfp[cfpI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -118,7 +118,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfe[cfeI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -140,7 +140,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cff[cffI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -162,7 +162,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfc[cfcI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -183,7 +183,7 @@ void Foam::cellMapper::calcAddressing() const
 
         forAll (cm, cellI)
         {
-            if (cm[cellI] > -1 && addr[cellI].size() == 0)
+            if (cm[cellI] > -1 && addr[cellI].empty())
             {
                 // Mapped from a single cell
                 addr[cellI] = labelList(1, cm[cellI]);
@@ -200,7 +200,7 @@ void Foam::cellMapper::calcAddressing() const
 
         forAll (addr, cellI)
         {
-            if (addr[cellI].size() == 0)
+            if (addr[cellI].empty())
             {
                 // Mapped from a dummy cell
                 addr[cellI] = labelList(1, 0);
@@ -242,10 +242,10 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
     // Check for possibility of direct mapping
     if
     (
-        mpm_.cellsFromPointsMap().size() == 0
-     && mpm_.cellsFromEdgesMap().size() == 0
-     && mpm_.cellsFromFacesMap().size() == 0
-     && mpm_.cellsFromCellsMap().size() == 0
+        mpm_.cellsFromPointsMap().empty()
+     && mpm_.cellsFromEdgesMap().empty()
+     && mpm_.cellsFromFacesMap().empty()
+     && mpm_.cellsFromCellsMap().empty()
     )
     {
         direct_ = true;
@@ -256,7 +256,7 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
     }
 
     // Check for inserted cells
-    if (direct_ && (mpm_.cellMap().size() == 0 || min(mpm_.cellMap()) > -1))
+    if (direct_ && (mpm_.cellMap().empty() || min(mpm_.cellMap()) > -1))
     {
         insertedCells_ = false;
     }
@@ -412,7 +412,7 @@ const Foam::labelList& Foam::cellMapper::insertedObjectLabels() const
 
     return *insertedCellLabelsPtr_;
 }
-        
+
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 0196a92f62..d9c54126c2 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -96,7 +96,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = ffp[ffpI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -118,7 +118,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = ffe[ffeI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -140,7 +140,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = fff[fffI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -160,7 +160,7 @@ void Foam::faceMapper::calcAddressing() const
 
         forAll (fm, faceI)
         {
-            if (fm[faceI] > -1 && addr[faceI].size() == 0)
+            if (fm[faceI] > -1 && addr[faceI].empty())
             {
                 // Mapped from a single face
                 addr[faceI] = labelList(1, fm[faceI]);
@@ -178,7 +178,7 @@ void Foam::faceMapper::calcAddressing() const
 
         forAll (addr, faceI)
         {
-            if (addr[faceI].size() == 0)
+            if (addr[faceI].empty())
             {
                 // Mapped from a dummy face
                 addr[faceI] = labelList(1, 0);
@@ -220,9 +220,9 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
     // Check for possibility of direct mapping
     if
     (
-        mpm_.facesFromPointsMap().size() == 0
-     && mpm_.facesFromEdgesMap().size() == 0
-     && mpm_.facesFromFacesMap().size() == 0
+        mpm_.facesFromPointsMap().empty() 
+     && mpm_.facesFromEdgesMap().empty()
+     && mpm_.facesFromFacesMap().empty()
     )
     {
         direct_ = true;
@@ -233,7 +233,7 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
     }
 
     // Check for inserted faces
-    if (direct_ && (mpm_.faceMap().size() == 0 || min(mpm_.faceMap()) > -1))
+    if (direct_ && (mpm_.faceMap().empty() || min(mpm_.faceMap()) > -1))
     {
         insertedFaces_ = false;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 841bc772fb..5dac2ebe9c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -48,12 +48,12 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
         {
             if (procI != Pstream::myProcNo())
             {
-                if (subMap[procI].size() > 0)
+                if (subMap[procI].size())
                 {
                     // I need to send to procI
                     commsSet.insert(labelPair(Pstream::myProcNo(), procI));
                 }
-                if (constructMap[procI].size() > 0)
+                if (constructMap[procI].size())
                 {
                     // I need to receive from procI
                     commsSet.insert(labelPair(procI, Pstream::myProcNo()));
@@ -152,7 +152,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
 
 const Foam::List<Foam::labelPair>& Foam::mapDistribute::schedule() const
 {
-    if (!schedulePtr_.valid())
+    if (schedulePtr_.empty())
     {
         schedulePtr_.reset
         (
@@ -288,7 +288,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed)
         {
             const labelList& map = constructMap_[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 boolList& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -315,7 +315,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed)
         {
             const labelList& map = subMap_[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 46204b3554..08e12b876e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -50,7 +50,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T> subField(map.size());
                 forAll(map, i)
@@ -86,7 +86,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 IPstream fromNbr(Pstream::blocking, domain);
                 List<T> subField(fromNbr);
@@ -227,7 +227,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T>& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -254,7 +254,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
@@ -303,14 +303,14 @@ void Foam::mapDistribute::distribute
 
         OPstream::waitRequests();
         IPstream::waitRequests();
-        
+
         // Collect neighbour fields
 
         for (label domain = 0; domain < Pstream::nProcs(); domain++)
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 if (recvFields[domain].size() != map.size())
                 {
@@ -372,7 +372,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T> subField(map.size());
                 forAll(map, i)
@@ -409,7 +409,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 IPstream fromNbr(Pstream::blocking, domain);
                 List<T> subField(fromNbr);
@@ -550,7 +550,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T>& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -577,7 +577,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
@@ -625,14 +625,14 @@ void Foam::mapDistribute::distribute
 
         OPstream::waitRequests();
         IPstream::waitRequests();
-        
+
         // Collect neighbour fields
 
         for (label domain = 0; domain < Pstream::nProcs(); domain++)
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 if (recvFields[domain].size() != map.size())
                 {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 20085cb361..261a952b06 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -251,7 +251,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
             }
         }
 
-        if (pointsToEdge.size() > 0)
+        if (pointsToEdge.size())
         {
             FatalErrorIn("polyBoundaryMesh::neighbourEdges() const")
                 << "Not all boundary edges of patches match up." << nl
@@ -425,7 +425,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
         // of all patch names for matches
         labelList patchIDs = findStrings(patchNames[i], allPatchNames);
 
-        if (patchIDs.size() == 0)
+        if (patchIDs.empty())
         {
             WarningIn("polyBoundaryMesh::patchSet(const wordList&)")
                 << "Cannot find any patch names matching " << patchNames[i]
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 65b9ec6412..a1b10f0d8a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -814,7 +814,7 @@ void Foam::polyMesh::addPatches
     const bool validBoundary
 )
 {
-    if (boundaryMesh().size() > 0)
+    if (boundaryMesh().size())
     {
         FatalErrorIn
         (
@@ -858,12 +858,7 @@ void Foam::polyMesh::addZones
     const List<cellZone*>& cz
 )
 {
-    if
-    (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-    )
+    if (pointZones().size() || faceZones().size() || cellZones().size())
     {
         FatalErrorIn
         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 1562740a31..690fb1083b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class coupledPolyPatch Declaration
+                      Class coupledPolyPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class coupledPolyPatch
@@ -256,7 +256,7 @@ public:
             //- Are the cyclic planes parallel
             bool parallel() const
             {
-                return forwardT_.size() == 0;
+                return forwardT_.empty();
             }
 
             //- Return face transformation tensor
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 593a0bb2d8..1e42d48ea3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -86,7 +86,7 @@ Foam::label Foam::cyclicPolyPatch::findMaxArea
 
 void Foam::cyclicPolyPatch::calcTransforms()
 {
-    if (size() > 0)
+    if (size())
     {
         const pointField& points = this->points();
 
@@ -1111,7 +1111,7 @@ bool Foam::cyclicPolyPatch::order
     rotation.setSize(pp.size());
     rotation = 0;
 
-    if (pp.size() == 0)
+    if (pp.empty())
     {
         // No faces, nothing to change.
         return false;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 15692da19a..1e045e6d77 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -143,7 +143,7 @@ void Foam::processorPolyPatch::initGeometry()
         (
             Pstream::blocking,
             neighbProcNo(),
-          + 3*(sizeof(label) + size()*sizeof(vector))
+            3*(sizeof(label) + size()*sizeof(vector) + sizeof(float))
         );
 
         toNeighbProc
@@ -163,7 +163,7 @@ void Foam::processorPolyPatch::calcGeometry()
             (
                 Pstream::blocking,
                 neighbProcNo(),
-                3*(sizeof(label) + size()*sizeof(vector))
+                3*(sizeof(label) + size()*sizeof(vector) + sizeof(float))
             );
             fromNeighbProc
                 >> neighbFaceCentres_
@@ -582,7 +582,7 @@ bool Foam::processorPolyPatch::order
                 transformedCtrs = masterCtrs-v[0];
             }
             else
-            {                    
+            {
                 transformedCtrs = masterCtrs-v;
             }
             matchedAll = matchPoints
@@ -605,7 +605,7 @@ bool Foam::processorPolyPatch::order
                     masterAnchors -= v[0];
                 }
                 else
-                {                    
+                {
                     masterAnchors -= v;
                 }
             }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 490981735c..4fcf243dd5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -211,7 +211,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::calcAddressing()
 
             forAll (neiFaces, nfI)
             {
-                if (neiFaces[nfI].size() > 0 && neiFaces[nfI][0] < minNei)
+                if (neiFaces[nfI].size() && neiFaces[nfI][0] < minNei)
                 {
                     nextNei = nfI;
                     minNei = neiFaces[nfI][0];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 70f2241cba..cb6987bd21 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -127,7 +127,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::
                         }
                     }
                 }
-            } while (faceOrder.size() > 0);
+            } while (faceOrder.size());
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
index a1ef18bece..e34b2a2a44 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
@@ -53,7 +53,7 @@ checkEdges
 
         // boundary edges have one face
         // interior edges have two faces
-        if (myFaces.size() == 0)
+        if (myFaces.empty())
         {
             FatalErrorIn
             (
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
index 1f859b03cc..0d56d9be1e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
@@ -97,12 +97,12 @@ void Foam::PrimitivePatchExtra<Face, FaceList, PointField, PointType>::markZone
             }
         }
 
-        if (newChangedFaces.size() == 0)
+        if (newChangedFaces.empty())
         {
             break;
         }
 
-        // New dynamicList: can leave dynamicList unshrunk
+        // transfer from dynamic to normal list
         changedFaces.transfer(newChangedFaces);
     }
 }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 5795efc28b..8938faf69b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -760,7 +760,7 @@ bool primitiveMesh::checkPoints
 
     forAll (pf, pointI)
     {
-        if (pf[pointI].size() == 0)
+        if (pf[pointI].empty())
         {
             if (setPtr)
             {
@@ -776,7 +776,7 @@ bool primitiveMesh::checkPoints
     {
         const labelList& pc = pointCells(pointI);
 
-        if (pc.size() == 0)
+        if (pc.empty())
         {
             if (setPtr)
             {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
index c5ab576e69..080ee1cd75 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
@@ -130,7 +130,7 @@ void patchZones::markZone(label faceI)
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -144,7 +144,7 @@ void patchZones::markZone(label faceI)
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
index e5fedccabd..f49c8beca8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
@@ -29,22 +29,14 @@ Description
 #include "walkPatch.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(walkPatch, 0);
-
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+defineTypeNameAndDebug(Foam::walkPatch, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Get other face using v0, v1 (in localFaces numbering). Or -1.
-label walkPatch::getNeighbour
+Foam::label Foam::walkPatch::getNeighbour
 (
     const label faceI,
     const label fp,
@@ -104,19 +96,11 @@ label walkPatch::getNeighbour
 
     const labelList& eFaces = pp_.edgeFaces()[nbrEdgeI];
 
-    if (eFaces.size() > 2 || eFaces.size() <= 0)
-    {
-        FatalErrorIn("getNeighbour")
-            << "Illegal surface on patch. Face " << faceI
-            << " at vertices " << v0 << ',' << v1 << " has more than 2"
-            << " or less than 1 neighbours" << abort(FatalError);
-        return -1;
-    }
-    else if (eFaces.size() == 1)
+    if (eFaces.size() == 1)
     {
         return -1;
     }
-    else
+    else if (eFaces.size() == 2)
     {
         label nbrFaceI = eFaces[0];
 
@@ -127,12 +111,21 @@ label walkPatch::getNeighbour
 
         return nbrFaceI;
     }
+    else
+    {
+        FatalErrorIn("getNeighbour")
+            << "Illegal surface on patch. Face " << faceI
+            << " at vertices " << v0 << ',' << v1
+            << " has fewer than 1 or more than 2 neighbours"
+            << abort(FatalError);
+        return -1;
+    }
 }
 
 
 // Gets labels of changed faces and enterVertices on faces.
 // Returns labels of faces changed and enterVertices on them.
-void walkPatch::faceToFace
+void Foam::walkPatch::faceToFace
 (
     const labelList& changedFaces,
     const labelList& enterVerts,
@@ -149,7 +142,7 @@ void walkPatch::faceToFace
     {
         label faceI = changedFaces[i];
         label enterVertI = enterVerts[i];
- 
+
         if (!visited_[faceI])
         {
             // Do this face
@@ -225,7 +218,7 @@ Foam::walkPatch::walkPatch
     // Corresponding list of entry vertices
     labelList enterVerts(1, enterVertI);
 
-    while(1)
+    while (true)
     {
         labelList nbrFaces;
         labelList nbrEnterVerts;
@@ -240,7 +233,7 @@ Foam::walkPatch::walkPatch
         );
 
 
-        if (nbrFaces.size() == 0)
+        if (nbrFaces.empty())
         {
             break;
         }
@@ -254,8 +247,4 @@ Foam::walkPatch::walkPatch
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index f21c7471e0..3538d94239 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -26,8 +26,7 @@ Primitive
     bool
 
 Description
-    C++ 4.0 supports a builtin type bool but older compilers do not.
-    This is a simple typedef to emulate the standard bool type.
+    System bool
 
 SourceFiles
     boolIO.C
diff --git a/src/OpenFOAM/primitives/bools/bool/boolIO.C b/src/OpenFOAM/primitives/bools/bool/boolIO.C
index 298624b271..b5636b5890 100644
--- a/src/OpenFOAM/primitives/bools/bool/boolIO.C
+++ b/src/OpenFOAM/primitives/bools/bool/boolIO.C
@@ -23,10 +23,9 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Reads an bool from an input stream, for a given version
-    number and File format. If an ascii File is being read,
-    then the line numbers are counted and an erroneous read
-    ised.
+    Reads an bool from an input stream, for a given version number and file
+    format. If an ASCII file is being read, then the line numbers are counted
+    and an erroneous read is reported.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/primitives/empty/empty.H b/src/OpenFOAM/primitives/nil/nil.H
similarity index 80%
rename from src/OpenFOAM/primitives/empty/empty.H
rename to src/OpenFOAM/primitives/nil/nil.H
index ba1628421c..320438ddc5 100644
--- a/src/OpenFOAM/primitives/empty/empty.H
+++ b/src/OpenFOAM/primitives/nil/nil.H
@@ -23,20 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::empty
+    Foam::nil
 
 Description
-    A class without storage. Used, for example, in HashSet.
+    A zero-sized class without any storage. Used, for example, in HashSet.
 
-SourceFiles
-    emptyI.H
-    empty.C
-    emptyIO.C
+Note
+    A zero-sized class actually does still require at least 1 byte storage.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef empty_H
-#define empty_H
+#ifndef nil_H
+#define nil_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,17 +47,17 @@ class Ostream;
 
 // Forward declaration of friend functions and operators
 
-class empty;
+class nil;
 
-Istream& operator>>(Istream& is, empty&);
-Ostream& operator<<(Ostream& os, const empty&);
+Istream& operator>>(Istream&, nil&);
+Ostream& operator<<(Ostream&, const nil&);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class empty Declaration
+                             Class nil Declaration
 \*---------------------------------------------------------------------------*/
 
-class empty
+class nil
 {
 
 public:
@@ -67,22 +65,22 @@ public:
     // Constructors
 
         //- Construct null
-        empty()
+        nil()
         {}
 
         //- Construct from Istream
-        empty(Istream&)
+        nil(Istream&)
         {}
 
 
-    // IOstream Operator
+    // IOstream Operators
 
-        friend Istream& operator>>(Istream& is, empty&)
+        friend Istream& operator>>(Istream& is, nil&)
         {
             return is;
         }
 
-        friend Ostream& operator<<(Ostream& os, const empty&)
+        friend Ostream& operator<<(Ostream& os, const nil&)
         {
             return os;
         }
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 8545d03a95..6a7e2056c6 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -238,9 +238,9 @@ void Foam::fileName::operator=(const char* str)
 
 Foam::fileName Foam::operator/(const string& a, const string& b)
 {
-    if (a.size() > 0)       // First string non-null
+    if (a.size())           // First string non-null
     {
-        if (b.size() > 0)   // Second string non-null
+        if (b.size())       // Second string non-null
         {
             return fileName(a + '/' + b);
         }
@@ -251,7 +251,7 @@ Foam::fileName Foam::operator/(const string& a, const string& b)
     }
     else                    // First string null
     {
-        if (b.size() > 0)   // Second string non-null
+        if (b.size())       // Second string non-null
         {
             return b;
         }
diff --git a/src/OpenFOAM/primitives/strings/string/string.C b/src/OpenFOAM/primitives/strings/string/string.C
index da918d09e1..84450a2242 100644
--- a/src/OpenFOAM/primitives/strings/string/string.C
+++ b/src/OpenFOAM/primitives/strings/string/string.C
@@ -25,13 +25,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "string.H"
-#include "debug.H"
 #include "OSspecific.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
-const char* const Foam::string::typeName = "string";
-int Foam::string::debug(debug::debugSwitch(string::typeName, 0));
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H
index 6e40e83871..cbf2d3bac8 100644
--- a/src/OpenFOAM/primitives/strings/string/string.H
+++ b/src/OpenFOAM/primitives/strings/string/string.H
@@ -80,8 +80,6 @@ public:
 
     // Static data members
 
-        static const char* const typeName;
-        static int debug;
         static const string null;
 
 
diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index 24942c70c8..f84b99be43 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -162,17 +162,17 @@ inline void Foam::word::operator=(const char* q)
 
 inline Foam::word Foam::operator&(const word& a, const word& b)
 {
-    if (!b.size())
-    {
-        return a;
-    }
-    else
+    if (b.size())
     {
         string ub = b;
         ub.string::operator[](0) = char(toupper(ub.string::operator[](0)));
 
         return a + ub;
     }
+    else
+    {
+        return a;
+    }
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/word/wordIO.C b/src/OpenFOAM/primitives/strings/word/wordIO.C
index 37cbaa79cf..093a282846 100644
--- a/src/OpenFOAM/primitives/strings/word/wordIO.C
+++ b/src/OpenFOAM/primitives/strings/word/wordIO.C
@@ -61,7 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
         string::stripInvalid<word>(w);
 
         // flag empty strings and bad chars as an error
-        if (!w.size() || w.size() != t.stringToken().size())
+        if (w.empty() || w.size() != t.stringToken().size())
         {
             is.setBad();
             FatalIOErrorIn("operator>>(Istream&, word&)", is)
diff --git a/src/OpenFOAM/primitives/uint/uintIO.C b/src/OpenFOAM/primitives/uint/uintIO.C
index 7b976aa96f..deed3da7ba 100644
--- a/src/OpenFOAM/primitives/uint/uintIO.C
+++ b/src/OpenFOAM/primitives/uint/uintIO.C
@@ -65,7 +65,7 @@ Istream& operator>>(Istream& is, unsigned int& i)
 
     if (t.isLabel())
     {
-        i = unsigned(t.labelToken());
+        i = static_cast<unsigned int>(t.labelToken());
     }
     else
     {
diff --git a/src/OpenFOAM/primitives/ulong/ulongIO.C b/src/OpenFOAM/primitives/ulong/ulongIO.C
index faad640bc2..e556b78d63 100644
--- a/src/OpenFOAM/primitives/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ulong/ulongIO.C
@@ -44,7 +44,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Return a string representation of an ulong
 word name(const unsigned long i)
 {
     std::ostringstream osBuffer;
@@ -66,7 +65,7 @@ Istream& operator>>(Istream& is, unsigned long& i)
 
     if (t.isLabel())
     {
-        i = ulong(t.labelToken());
+        i = static_cast<unsigned long>(t.labelToken());
     }
     else
     {
diff --git a/src/Pstream/gamma/OPwrite.C b/src/Pstream/gamma/OPwrite.C
index fedc525d65..00eaa13f81 100644
--- a/src/Pstream/gamma/OPwrite.C
+++ b/src/Pstream/gamma/OPwrite.C
@@ -98,7 +98,7 @@ bool OPstream::write
             << Foam::abort(FatalError);
     }
 
-    if (maxSendSize.size() == 0)
+    if (maxSendSize.empty())
     {
         // Intialize maxSendSize to the initial size of the receive buffers.
         maxSendSize.setSize(Pstream::nProcs());
diff --git a/src/Pstream/mpi/IPread.C b/src/Pstream/mpi/IPread.C
index ad3c915e7e..2b6953765a 100644
--- a/src/Pstream/mpi/IPread.C
+++ b/src/Pstream/mpi/IPread.C
@@ -191,7 +191,7 @@ Foam::label Foam::IPstream::read
 
 void Foam::IPstream::waitRequests()
 {
-    if (IPstream_outstandingRequests_.size() > 0)
+    if (IPstream_outstandingRequests_.size())
     {
         if
         (
diff --git a/src/Pstream/mpi/OPwrite.C b/src/Pstream/mpi/OPwrite.C
index 9b2ecda890..230a366ebd 100644
--- a/src/Pstream/mpi/OPwrite.C
+++ b/src/Pstream/mpi/OPwrite.C
@@ -129,7 +129,7 @@ bool Foam::OPstream::write
 
 void Foam::OPstream::waitRequests()
 {
-    if (OPstream_outstandingRequests_.size() > 0)
+    if (OPstream_outstandingRequests_.size())
     {
         if
         (
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 300ed06c5e..7a3152b494 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -351,7 +351,7 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
     ////  in when snapping)
     //
     //labelList namedSurfaces(surfaces().getNamedSurfaces());
-    //if (namedSurfaces.size() > 0)
+    //if (namedSurfaces.size())
     //{
     //    Info<< nl
     //        << "Introducing cyclics for faceZones" << nl
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index c8e9baafe5..b384902710 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2420,7 +2420,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
     {
         const labelList& layer = layerFaces[oldPatchFaceI];
 
-        if (layer.size() > 0)
+        if (layer.size())
         {
             for (label i = 1; i < layer.size()-1; i++)
             {
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 93fa342507..f602376461 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -143,7 +143,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
 
     label iter = 0;
 
-    if (featureMeshes.size() > 0 && maxIter > 0)
+    if (featureMeshes.size() && maxIter > 0)
     {
         for (; iter < maxIter; iter++)
         {
@@ -541,7 +541,7 @@ void Foam::autoRefineDriver::zonify
     // into that surface's faceZone. All cells inside faceZone get given the
     // same cellZone.
 
-    if (meshRefiner_.surfaces().getNamedSurfaces().size() > 0)
+    if (meshRefiner_.surfaces().getNamedSurfaces().size())
     {
         Info<< nl
             << "Introducing zones for interfaces" << nl
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index adcd9c5aeb..a4cd0a504d 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -73,7 +73,7 @@ void Foam::autoSnapDriver::getZonedSurfaces
 
     forAll(faceZoneNames, surfI)
     {
-        if (faceZoneNames[surfI].size() > 0)
+        if (faceZoneNames[surfI].size())
         {
             zonedSurfaces[zonedI++] = surfI;
         }
@@ -103,7 +103,7 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
 
     forAll(faceZoneNames, surfI)
     {
-        if (faceZoneNames[surfI].size() > 0)
+        if (faceZoneNames[surfI].size())
         {
             // Get zone
             label zoneI = fZones.findZoneID(faceZoneNames[surfI]);
@@ -718,7 +718,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::createZoneBaffles
     autoPtr<mapPolyMesh> map;
 
     // No need to sync; all processors will have all same zonedSurfaces.
-    if (zonedSurfaces.size() > 0)
+    if (zonedSurfaces.size())
     {
         fvMesh& mesh = meshRefiner_.mesh();
 
@@ -806,7 +806,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
 
     // No need to sync; all processors will have all same zonedSurfaces.
     label nBaffles = returnReduce(baffles.size(), sumOp<label>());
-    if (zonedSurfaces.size() > 0 && nBaffles > 0)
+    if (zonedSurfaces.size() && nBaffles > 0)
     {
         // Merge any baffles
         Info<< "Converting " << nBaffles << " baffles back into zoned faces ..."
@@ -1122,7 +1122,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 
             forAll(hitInfo, i)
             {
-                label pointI = zonePointIndices[i]; 
+                label pointI = zonePointIndices[i];
 
                 if (hitInfo[i].hit())
                 {
@@ -1391,7 +1391,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
             forAll(fZone, i)
             {
                 isZonedFace.set(fZone[i], 1);
-            }  
+            }
         }
     }
 
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index c80e6a4881..4b10b84763 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1060,7 +1060,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 
                 forAll(fzNames, surfI)
                 {
-                    if (fzNames[surfI].size() > 0)
+                    if (fzNames[surfI].size())
                     {
                         // Get zone
                         label zoneI = fZones.findZoneID(fzNames[surfI]);
@@ -1713,7 +1713,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
 
     labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
 
-    if (exposedFaces.size() > 0)
+    if (exposedFaces.size())
     {
         FatalErrorIn
         (
@@ -2148,7 +2148,7 @@ void Foam::meshRefinement::write
     {
         dumpRefinementLevel();
     }
-    if (flag&OBJINTERSECTIONS && prefix.size()>0)
+    if (flag & OBJINTERSECTIONS && prefix.size())
     {
         dumpIntersections(prefix);
     }
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 79d698bef6..2d7ca7314b 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -241,7 +241,7 @@ void Foam::meshRefinement::getBafflePatches
     label baffleI = 0;
     forAll(cellZoneNames, surfI)
     {
-        if (cellZoneNames[surfI].size() > 0)
+        if (cellZoneNames[surfI].size())
         {
             if (debug)
             {
@@ -1385,7 +1385,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
             faceSet problemTopo(mesh_, "problemFacesTopo", 100);
 
             const labelList facePatchTopo
-            (    
+            (
                 markFacesOnProblemCells
                 (
                     removeEdgeConnectedCells,
@@ -1605,7 +1605,7 @@ Foam::autoPtr<Foam::mapPolyMesh>  Foam::meshRefinement::splitMesh
 
     // Patch for exposed faces for lack of anything sensible.
     label defaultPatch = 0;
-    if (globalToPatch.size() > 0)
+    if (globalToPatch.size())
     {
         defaultPatch = globalToPatch[0];
     }
@@ -2155,7 +2155,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     // Set using geometric test
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    if (closedNamedSurfaces.size() > 0)
+    if (closedNamedSurfaces.size())
     {
         findCellZoneGeometric
         (
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index bf728dfe48..6277740b9a 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -416,12 +416,12 @@ Foam::refinementSurfaces::refinementSurfaces
 // Get indices of unnamed surfaces (surfaces without faceZoneName)
 Foam::labelList Foam::refinementSurfaces::getUnnamedSurfaces() const
 {
-   labelList anonymousSurfaces(faceZoneNames_.size());
+    labelList anonymousSurfaces(faceZoneNames_.size());
 
     label i = 0;
     forAll(faceZoneNames_, surfI)
     {
-        if (faceZoneNames_[surfI].size() == 0)
+        if (faceZoneNames_[surfI].empty())
         {
             anonymousSurfaces[i++] = surfI;
         }
@@ -440,7 +440,7 @@ Foam::labelList Foam::refinementSurfaces::getNamedSurfaces() const
     label namedI = 0;
     forAll(faceZoneNames_, surfI)
     {
-        if (faceZoneNames_[surfI].size() > 0)
+        if (faceZoneNames_[surfI].size())
         {
             namedSurfaces[namedI++] = surfI;
         }
@@ -574,7 +574,7 @@ void Foam::refinementSurfaces::findHigherIntersection
     surfaceLevel.setSize(start.size());
     surfaceLevel = -1;
 
-    if (surfaces_.size() == 0)
+    if (surfaces_.empty())
     {
         return;
     }
@@ -614,14 +614,14 @@ void Foam::refinementSurfaces::findHigherIntersection
             if (hitInfo[hitI].hit())
             {
                 // Check if minLevelField for this surface.
-                if (minLevelField.size() > 0)
+                if (minLevelField.size())
                 {
                     minLocalLevel = minLevelField[hitI];
                 }
                 else
                 {
                     // Use the min level for the surface instead. Assume
-                    // single region 0. 
+                    // single region 0.
                     minLocalLevel = minLevel(surfI, 0);
                 }
             }
@@ -673,7 +673,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
     surfaceLevel.setSize(start.size());
     surfaceNormal.setSize(start.size());
 
-    if (surfaces_.size() == 0)
+    if (surfaces_.empty())
     {
         return;
     }
@@ -969,7 +969,7 @@ void Foam::refinementSurfaces::findNearestRegion
 
         List<pointIndexHit> localHits
         (
-            IndirectList<pointIndexHit> 
+            IndirectList<pointIndexHit>
             (
                 hitInfo,
                 localIndices
diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
index 492ceaa58e..9c06ccddea 100644
--- a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
@@ -170,7 +170,7 @@ void Foam::shellSurfaces::orient()
         {
             const triSurfaceMesh& shell = refCast<const triSurfaceMesh>(s);
 
-            if (shell.triSurface::size() > 0)
+            if (shell.triSurface::size())
             {
                 const pointField& points = shell.points();
 
diff --git a/src/conversion/meshTables/boundaryRegion.C b/src/conversion/meshTables/boundaryRegion.C
index 73b9abcd36..b5c278887f 100644
--- a/src/conversion/meshTables/boundaryRegion.C
+++ b/src/conversion/meshTables/boundaryRegion.C
@@ -114,7 +114,7 @@ Foam::Map<Foam::word> Foam::boundaryRegion::names
         {
             lookup.insert(iter.key(), lookupName);
         }
-    }    
+    }
 
     return lookup;
 }
@@ -139,7 +139,7 @@ Foam::Map<Foam::word> Foam::boundaryRegion::boundaryTypes() const
 
 Foam::label Foam::boundaryRegion::findIndex(const word& name) const
 {
-    if (!name.size())
+    if (name.empty())
     {
         return -1;
     }
@@ -254,7 +254,7 @@ void Foam::boundaryRegion::operator=(const Map<dictionary>& rhs)
 
 void Foam::boundaryRegion::rename(const dictionary& mapDict)
 {
-    if (!mapDict.size())
+    if (mapDict.empty())
     {
         return;
     }
diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C
index 6b3789eb02..2d640deb7e 100644
--- a/src/conversion/meshTables/cellTable.C
+++ b/src/conversion/meshTables/cellTable.C
@@ -208,7 +208,7 @@ Foam::word Foam::cellTable::name(const label& id) const
 
 Foam::label Foam::cellTable::findIndex(const word& name) const
 {
-    if (!name.size())
+    if (name.empty())
     {
         return -1;
     }
@@ -466,7 +466,7 @@ void Foam::cellTable::addCellZones
     forAll(zoneCells, zoneI)
     {
         zoneCells[zoneI].shrink();
-        if (zoneCells[zoneI].size() > 0)
+        if (zoneCells[zoneI].size())
         {
             zoneUsed[nZone++] = zoneI;
         }
@@ -509,27 +509,37 @@ void Foam::cellTable::addCellZones
 
 void Foam::cellTable::combine(const dictionary& mapDict, labelList& tableIds)
 {
-    if (!mapDict.size())
+    if (mapDict.empty())
     {
         return;
     }
 
-    bool remap = false;
-    labelList mapping(identity(max(this->toc()) + 1));
+    Map<word> origNames(names());
+    labelList mapping(identity(max(origNames.toc()) + 1));
 
+    bool remap = false;
     forAllConstIter(dictionary, mapDict, iter)
     {
-        Map<word> matches = names(wordReList(iter().stream()));
+        wordReList patterns(iter().stream());
+
+        // find all matches
+        Map<word> matches;
+        forAllConstIter(Map<word>, origNames, namesIter)
+        {
+            if (findStrings(patterns, namesIter()))
+            {
+                matches.insert(namesIter.key(), namesIter());
+            }
+        }
 
         if (matches.size())
         {
-            remap = true;
             label targetId = this->findIndex(iter().keyword());
 
             Info<< "combine cellTable: " << iter().keyword();
             if (targetId < 0)
             {
-                // re-use the first element if possible
+                // not found - reuse 1st element but with different name
                 targetId = min(matches.toc());
                 operator[](targetId).set("Label", iter().keyword());
 
@@ -541,19 +551,22 @@ void Foam::cellTable::combine(const dictionary& mapDict, labelList& tableIds)
             }
 
 
+            // the mapping and name for targetId is already okay
+            matches.erase(targetId);
+            origNames.erase(targetId);
+
+            // remove matched names, leaving targetId on 'this'
+            this->erase(matches);
+            origNames.erase(matches);
+
             forAllConstIter(Map<word>, matches, matchIter)
             {
-                label idx = matchIter.key();
-
-                if (idx != targetId && idx >= 0)
-                {
-                    mapping[idx] = targetId;
-                    this->erase(idx);
-                }
-
+                mapping[matchIter.key()] = targetId;
                 Info<< " " << matchIter();
             }
             Info<< " )" << endl;
+
+            remap = true;
         }
     }
 
diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict
index d7059d051b..1a53982f79 100644
--- a/src/conversion/meshTables/remappingDict
+++ b/src/conversion/meshTables/remappingDict
@@ -21,10 +21,11 @@ FoamFile
 //   newName ( listOldNames );
 cellTable
 {
-    fluid ( fluid "[Ff]Luid[0-9]+" "(inlet|outlet)Region" );
+    fluid ( fluid "[Ff]Luid[0-9]+" "(inlet|outlet)Region" "cellTable_[0-9]+" );
     cat1  ( CAT1 "cat1_(Back|Front|Gamma)" );
 }
 
+
 // rename boundary regions
 //   newName oldName;
 boundaryRegion
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 6053314948..5d4bc79205 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -92,7 +92,7 @@ void Foam::meshWriters::STARCD::getCellTable()
         {
             cellTableId_.transfer(ioList);
 
-            if (!cellTable_.size())
+            if (cellTable_.empty())
             {
                 Info<< "no cellTable information available" << endl;
             }
@@ -116,7 +116,7 @@ void Foam::meshWriters::STARCD::getCellTable()
 
     if (useCellZones)
     {
-        if (!cellTable_.size())
+        if (cellTable_.empty())
         {
             Info<< "created cellTable from cellZones" << endl;
             cellTable_ = mesh_;
@@ -500,7 +500,7 @@ bool Foam::meshWriters::STARCD::write(const fileName& meshName) const
 {
     fileName baseName(meshName);
 
-    if (!baseName.size())
+    if (baseName.empty())
     {
         baseName = meshWriter::defaultMeshName;
 
@@ -535,7 +535,7 @@ bool Foam::meshWriters::STARCD::writeSurface
 {
     fileName baseName(meshName);
 
-    if (!baseName.size())
+    if (baseName.empty())
     {
         baseName = meshWriter::defaultSurfaceName;
 
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 7d12bab37f..0db23c7ed6 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -758,7 +758,7 @@ void Foam::polyDualMesh::calcDual
 
         allBoundary.checkPointManifold(true, &nonManifoldPoints);
 
-        if (nonManifoldPoints.size() > 0)
+        if (nonManifoldPoints.size())
         {
             nonManifoldPoints.write();
 
@@ -1151,7 +1151,7 @@ void Foam::polyDualMesh::calcDual
         dynDualOwner.shrink();
         dynDualNeighbour.shrink();
         dynDualRegion.shrink();
-    
+
         OFstream str("dualInternalFaces.obj");
         Pout<< "polyDualMesh::calcDual : dumping internal faces to "
             << str.name() << endl;
@@ -1163,7 +1163,7 @@ void Foam::polyDualMesh::calcDual
         forAll(dynDualFaces, dualFaceI)
         {
             const face& f = dynDualFaces[dualFaceI];
-    
+
             str<< 'f';
             forAll(f, fp)
             {
@@ -1229,7 +1229,7 @@ void Foam::polyDualMesh::calcDual
         forAll(dualFaces, dualFaceI)
         {
             const face& f = dualFaces[dualFaceI];
-    
+
             str<< 'f';
             forAll(f, fp)
             {
diff --git a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 722deab57c..882123c526 100644
--- a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -236,14 +236,18 @@ void Foam::hierarchGeomDecomp::sortComponent
 
     scalar minCoord = returnReduce
     (
-        (sortedCoord.size() > 0 ? sortedCoord[0] : GREAT),
+        (
+            sortedCoord.size()
+          ? sortedCoord[0]
+          : GREAT
+        ),
         minOp<scalar>()
     );
 
     scalar maxCoord = returnReduce
     (
         (
-            sortedCoord.size() > 0
+            sortedCoord.size()
           ? sortedCoord[sortedCoord.size()-1]
           : -GREAT
         ),
@@ -251,7 +255,7 @@ void Foam::hierarchGeomDecomp::sortComponent
     );
 
     if (debug)
-    {   
+    {
         Pout<< "sortComponent : minCoord:" << minCoord
             << " maxCoord:" << maxCoord << endl;
     }
@@ -274,7 +278,7 @@ void Foam::hierarchGeomDecomp::sortComponent
 
         // Value at right of bin (leftIndex+localSize-1)
         scalar rightCoord = -GREAT;
-        
+
         if (bin == n_[compI]-1)
         {
             // Last bin. Copy all.
diff --git a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C b/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
index 5d368642b6..b4a643562f 100644
--- a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
+++ b/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
@@ -220,12 +220,12 @@ Foam::label Foam::metisDecomp::decompose
     int* vwgtPtr = NULL;
     int* adjwgtPtr = NULL;
 
-    if (cellWeights.size() > 0)
+    if (cellWeights.size())
     {
         vwgtPtr = cellWeights.begin();
         wgtFlag += 2;       // Weights on vertices
     }
-    if (faceWeights.size() > 0)
+    if (faceWeights.size())
     {
         adjwgtPtr = faceWeights.begin();
         wgtFlag += 1;       // Weights on edges
diff --git a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C b/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
index 73c8160af7..c6c6e061e9 100644
--- a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
+++ b/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
@@ -188,7 +188,7 @@ Foam::label Foam::parMetisDecomp::decompose
             << SubField<floatScalar>(xyz, nDims*nCells, nDims*startCell)
             <<
             (
-                (cellWeights.size() > 0)
+                cellWeights.size()
               ? static_cast<const Field<int>&>
                 (
                     Field<int>::subField(cellWeights, nCells, startCell)
@@ -197,7 +197,7 @@ Foam::label Foam::parMetisDecomp::decompose
             )
             <<
             (
-                (faceWeights.size() > 0)
+                faceWeights.size()
               ? static_cast<const Field<int>&>
                 (
                     Field<int>::subField(faceWeights, nFaces, startFace)
@@ -206,11 +206,11 @@ Foam::label Foam::parMetisDecomp::decompose
             );
 
         // Remove data that has been sent
-        if (faceWeights.size() > 0)
+        if (faceWeights.size())
         {
             faceWeights.setSize(faceWeights.size()-nFaces);
         }
-        if (cellWeights.size() > 0)
+        if (cellWeights.size())
         {
             cellWeights.setSize(cellWeights.size()-nCells);
         }
@@ -255,12 +255,12 @@ Foam::label Foam::parMetisDecomp::decompose
     int* vwgtPtr = NULL;
     int* adjwgtPtr = NULL;
 
-    if (cellWeights.size() > 0)
+    if (cellWeights.size())
     {
         vwgtPtr = cellWeights.begin();
         wgtFlag += 2;       // Weights on vertices
     }
-    if (faceWeights.size() > 0)
+    if (faceWeights.size())
     {
         adjwgtPtr = faceWeights.begin();
         wgtFlag += 1;       // Weights on edges
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 99fc1b78fd..2cb639cb63 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -66,7 +66,7 @@ void dynamicRefineFvMesh::calculateProtectedCells
     PackedList<1>& unrefineableCell
 ) const
 {
-    if (protectedCell_.size() == 0)
+    if (protectedCell_.empty())
     {
         unrefineableCell.clear();
         return;
@@ -375,7 +375,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
                 }
             }
         }
-    }            
+    }
 
 
 
@@ -383,7 +383,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
     meshCutter_.updateMesh(map);
 
     // Update numbering of protectedCell_
-    if (protectedCell_.size() > 0)
+    if (protectedCell_.size())
     {
         PackedList<1> newProtectedCell(nCells(), 0);
 
@@ -536,7 +536,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
     meshCutter_.updateMesh(map);
 
     // Update numbering of protectedCell_
-    if (protectedCell_.size() > 0)
+    if (protectedCell_.size())
     {
         PackedList<1> newProtectedCell(nCells(), 0);
 
@@ -703,7 +703,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
                 cellLevel[cellI] < maxRefinement
              && candidateCell.get(cellI) == 1
              && (
-                    unrefineableCell.size() == 0
+                    unrefineableCell.empty()
                  || unrefineableCell.get(cellI) == 0
                 )
             )
@@ -724,7 +724,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
                     cellLevel[cellI] == level
                  && candidateCell.get(cellI) == 1
                  && (
-                        unrefineableCell.size() == 0
+                        unrefineableCell.empty()
                      || unrefineableCell.get(cellI) == 0
                     )
                 )
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 777407492a..43305938cb 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -83,8 +83,8 @@ void Foam::attachDetach::checkDefinition()
     // Check the sizes and set up state
     if
     (
-        mesh.boundaryMesh()[masterPatchID_.index()].size() == 0
-     && mesh.boundaryMesh()[slavePatchID_.index()].size() == 0
+        mesh.boundaryMesh()[masterPatchID_.index()].empty()
+     && mesh.boundaryMesh()[slavePatchID_.index()].empty()
     )
     {
         // Boundary is attached
@@ -96,7 +96,7 @@ void Foam::attachDetach::checkDefinition()
         state_ = ATTACHED;
 
         // Check if there are faces in the master zone
-        if (mesh.faceZones()[faceZoneID_.index()].size() == 0)
+        if (mesh.faceZones()[faceZoneID_.index()].empty())
         {
             FatalErrorIn
             (
@@ -121,7 +121,7 @@ void Foam::attachDetach::checkDefinition()
                 }
             }
 
-            if (bouFacesInZone.size() > 0)
+            if (bouFacesInZone.size())
             {
                 FatalErrorIn
                 (
@@ -196,7 +196,7 @@ void Foam::attachDetach::checkDefinition()
                 }
             }
 
-            if (zoneProblemFaces.size() > 0)
+            if (zoneProblemFaces.size())
             {
                 FatalErrorIn
                 (
@@ -222,7 +222,7 @@ void Foam::attachDetach::checkDefinition()
     if
     (
         !triggersOK
-     || (triggerTimes_.size() < 1 && !manualTrigger())
+     || (triggerTimes_.empty() && !manualTrigger())
     )
     {
         FatalErrorIn
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 28396e2918..494cda9295 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -37,10 +37,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(boundaryMesh, 0);
-}
+defineTypeNameAndDebug(Foam::boundaryMesh, 0);
 
 // Normal along which to divide faces into categories (used in getNearest)
 const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
@@ -394,14 +391,13 @@ void Foam::boundaryMesh::markZone
 
     while(1)
     {
-        changedEdges =
-            faceToEdge
-            (
-                borderEdge,
-                currentZone,
-                changedFaces,
-                edgeZone
-            );
+        changedEdges = faceToEdge
+        (
+            borderEdge,
+            currentZone,
+            changedFaces,
+            edgeZone
+        );
 
         if (debug)
         {
@@ -410,7 +406,7 @@ void Foam::boundaryMesh::markZone
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -424,7 +420,7 @@ void Foam::boundaryMesh::markZone
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedFaces.empty())
         {
             break;
         }
@@ -604,7 +600,7 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
 {
     triSurface surf(fName);
 
-    if (surf.size() <= 0)
+    if (surf.empty())
     {
         return;
     }
@@ -1239,7 +1235,7 @@ void Foam::boundaryMesh::patchify
     // Pass2:
     // Change patch type for face
 
-    if (newPatchPtrList.size() > 0)
+    if (newPatchPtrList.size())
     {
         List<DynamicList<label> > patchFaces(nNewPatches);
 
@@ -1597,7 +1593,7 @@ void Foam::boundaryMesh::deletePatch(const word& patchName)
             << abort(FatalError);
     }
 
-    if (patches_[delPatchI].size() != 0)
+    if (patches_[delPatchI].size())
     {
         FatalErrorIn("boundaryMesh::deletePatch(const word&")
             << "Trying to delete non-empty patch " << patchName
@@ -1715,7 +1711,7 @@ void Foam::boundaryMesh::changeFaces
     {
         label patchID = patchIDs[faceI];
 
-        if ((patchID < 0) || (patchID >= patches_.size()))
+        if (patchID < 0 || patchID >= patches_.size())
         {
             FatalErrorIn("boundaryMesh::changeFaces(const labelList&)")
                 << "PatchID " << patchID << " out of range"
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 31138b5e68..38e040506f 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -196,7 +196,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
             << endl;
     }
 
-    if (mesh.pointZones().size() > 0)
+    if (mesh.pointZones().size())
     {
         Pout<< "PointZones:" << endl;
         forAll(mesh.pointZones(), zoneI)
@@ -207,7 +207,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
                 << endl;
         }
     }
-    if (mesh.faceZones().size() > 0)
+    if (mesh.faceZones().size())
     {
         Pout<< "FaceZones:" << endl;
         forAll(mesh.faceZones(), zoneI)
@@ -218,7 +218,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
                 << endl;
         }
     }
-    if (mesh.cellZones().size() > 0)
+    if (mesh.cellZones().size())
     {
         Pout<< "CellZones:" << endl;
         forAll(mesh.cellZones(), zoneI)
@@ -392,7 +392,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatch()
         const_cast<polyBoundaryMesh&>(mesh_.boundaryMesh());
     fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh_.boundary());
 
-    if (polyPatches.size() == 0)
+    if (polyPatches.empty())
     {
         FatalErrorIn("fvMeshDistribute::deleteTrailingPatch(fvMesh&)")
             << "No patches in mesh"
@@ -410,7 +410,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatch()
             << " : " << polyPatches[sz-1].name() << " size:" << nFaces << endl;
     }
 
-    if (nFaces != 0)
+    if (nFaces)
     {
         FatalErrorIn("fvMeshDistribute::deleteTrailingPatch()")
             << "There are still " << nFaces << " faces in patch to be deleted "
@@ -2035,7 +2035,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
 
             forAll(constructPatchMap, procI)
             {
-                if (procI != sendProc && constructPatchMap[procI].size() > 0)
+                if (procI != sendProc && constructPatchMap[procI].size())
                 {
                     // Processor already in mesh (either myProcNo or received)
                     inplaceRenumber(oldCellMap, constructCellMap[procI]);
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 27a54a0556..934484a797 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -80,13 +80,13 @@ void Foam::layerAdditionRemoval::checkDefinition()
             << abort(FatalError);
     }
 
-    if (topoChanger().mesh().faceZones()[faceZoneID_.index()].size() == 0)
+    if (topoChanger().mesh().faceZones()[faceZoneID_.index()].empty())
     {
         FatalErrorIn
         (
             "void Foam::layerAdditionRemoval::checkDefinition()"
-        )   << "Face extrusion zone contains no faces.  Please check your "
-            << "mesh definition."
+        )   << "Face extrusion zone contains no faces. "
+            << " Please check your mesh definition."
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 45b2da5168..7e0e1fbb8d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -37,12 +37,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(cellCuts, 0);
-
-}
+defineTypeNameAndDebug(Foam::cellCuts, 0);
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
@@ -2012,7 +2007,7 @@ void Foam::cellCuts::setFromCellLoops()
     {
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             // Storage for cross-face cuts
             Map<edge> faceSplitCuts(loop.size());
@@ -2203,7 +2198,7 @@ void Foam::cellCuts::setFromCellLoops
 
         const labelList& loop = cellLoops[cellLabelI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             const scalarField& loopWeights = cellLoopWeights[cellLabelI];
 
@@ -2296,7 +2291,7 @@ void Foam::cellCuts::setFromCellCutter
         }
     }
 
-    if (debug && invalidCutCells.size() > 0)
+    if (debug && invalidCutCells.size())
     {
         invalidCutCells.shrink();
         invalidCutLoops.shrink();
@@ -2408,7 +2403,7 @@ void Foam::cellCuts::setFromCellCutter
         }
     }
 
-    if (debug && invalidCutCells.size() > 0)
+    if (debug && invalidCutCells.size())
     {
         invalidCutCells.shrink();
         invalidCutLoops.shrink();
@@ -2458,7 +2453,7 @@ void Foam::cellCuts::orientPlanesAndLoops()
     {
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0 && cellAnchorPoints_[cellI].size() == 0)
+        if (loop.size() && cellAnchorPoints_[cellI].empty())
         {
             // Leave anchor points empty if illegal loop.
             calcAnchors
@@ -2477,9 +2472,9 @@ void Foam::cellCuts::orientPlanesAndLoops()
     }
     forAll(cellAnchorPoints_, cellI)
     {
-        if (cellLoops_[cellI].size() > 0)
+        if (cellLoops_[cellI].size())
         {
-            if (cellAnchorPoints_[cellI].size() == 0)
+            if (cellAnchorPoints_[cellI].empty())
             {
                 FatalErrorIn("orientPlanesAndLoops()")
                     << "No anchor points for cut cell " << cellI << endl
@@ -2499,7 +2494,7 @@ void Foam::cellCuts::orientPlanesAndLoops()
 
     forAll(cellLoops_, cellI)
     {
-        if (cellLoops_[cellI].size() > 0)
+        if (cellLoops_[cellI].size())
         {
             nLoops_++;
         }
@@ -2545,7 +2540,7 @@ void Foam::cellCuts::calcLoopsAndAddressing(const labelList& cutCells)
         {
             const labelList& loop = cellLoops_[cellI];
 
-            if (loop.size() > 0)
+            if (loop.size())
             {
                 Pout<< "cell:" << cellI << "  ";
                 writeCuts(Pout, loop, loopWeights(loop));
@@ -2632,7 +2627,7 @@ void Foam::cellCuts::check() const
 
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0 && anchors.size() == 0)
+        if (loop.size() && anchors.empty())
         {
             FatalErrorIn("cellCuts::check()")
                 << "cell:" << cellI << " loop:" << loop
@@ -2671,11 +2666,7 @@ void Foam::cellCuts::check() const
             label own = mesh().faceOwner()[faceI];
             label nei = mesh().faceNeighbour()[faceI];
 
-            if
-            (
-                cellLoops_[own].size() == 0
-             && cellLoops_[nei].size() == 0
-            )
+            if (cellLoops_[own].empty() && cellLoops_[nei].empty())
             {
                 FatalErrorIn("cellCuts::check()")
                     << "Internal face:" << faceI << " cut by " << iter()
@@ -2689,7 +2680,7 @@ void Foam::cellCuts::check() const
         {
             label own = mesh().faceOwner()[faceI];
 
-            if (cellLoops_[own].size() == 0)
+            if (cellLoops_[own].empty())
             {
                 FatalErrorIn("cellCuts::check()")
                     << "Boundary face:" << faceI << " cut by " << iter()
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
index 4a6aa1d5a9..73f7bca59e 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
@@ -206,23 +206,22 @@ bool Foam::hexCellLooper::cut
     }
     else
     {
-        success = 
-            geomCellLooper::cut
-            (
-                refDir,
-                cellI,
-                vertIsCut,
-                edgeIsCut,
-                edgeWeight,
+        success = geomCellLooper::cut
+        (
+            refDir,
+            cellI,
+            vertIsCut,
+            edgeIsCut,
+            edgeWeight,
 
-                loop,
-                loopWeights
-            );
+            loop,
+            loopWeights
+        );
     }
 
     if (debug)
     {
-        if (loop.size() == 0)
+        if (loop.empty())
         {
             WarningIn("hexCellLooper")
                 << "could not cut cell " << cellI << endl;
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index 7c20fa191b..3572546e75 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -510,15 +510,14 @@ void Foam::topoCellLooper::walkSplitHex
             {
                 // Normal vertex on edge of face. Get edges connected to it
                 // which are not on faceI.
-                labelList nextEdges =
-                    getVertEdgesNonFace
-                    (
-                        cellI,
-                        faceI,
-                        vertI
-                    );
+                labelList nextEdges = getVertEdgesNonFace
+                (
+                    cellI,
+                    faceI,
+                    vertI
+                );
 
-                if (nextEdges.size() == 0)
+                if (nextEdges.empty())
                 {
                     // Cross to other face (there is only one since no edges)
                     const labelList& pFaces = mesh().pointFaces()[vertI];
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 0ebf692ab3..6cbf8ecfc0 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -38,13 +38,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(meshCutAndRemove, 0);
-
-}
-
+defineTypeNameAndDebug(Foam::meshCutAndRemove, 0);
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
 
@@ -116,12 +110,12 @@ Foam::label Foam::meshCutAndRemove::findCutCell
     {
         label cellI = cellLabels[labelI];
 
-        if (cuts.cellLoops()[cellI].size() > 0)
+        if (cuts.cellLoops()[cellI].size())
         {
             return cellI;
         }
     }
-    return -1;        
+    return -1;
 }
 
 
@@ -151,7 +145,7 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
         }
     }
 
-    if (pointLabels.size() == 0)
+    if (pointLabels.empty())
     {
         FatalErrorIn("meshCutAndRemove::findInternalFacePoint(const labelList&)")
             << "Empty pointLabels" << abort(FatalError);
@@ -212,7 +206,7 @@ void Foam::meshCutAndRemove::faceCells
 
     own = mesh().faceOwner()[faceI];
 
-    if (cellLoops[own].size() > 0 && (firstCommon(f, anchorPts[own]) == -1))
+    if (cellLoops[own].size() && firstCommon(f, anchorPts[own]) == -1)
     {
         // owner has been split and this is the removed part.
         own = -1;
@@ -224,7 +218,7 @@ void Foam::meshCutAndRemove::faceCells
     {
         nei = mesh().faceNeighbour()[faceI];
 
-        if (cellLoops[nei].size() > 0 && (firstCommon(f, anchorPts[nei]) == -1))
+        if (cellLoops[nei].size() && firstCommon(f, anchorPts[nei]) == -1)
         {
             nei = -1;
         }
@@ -711,7 +705,7 @@ void Foam::meshCutAndRemove::setRefinement
         {
             const labelList& loop = cellLoops[cellI];
 
-            if (loop.size() > 0)
+            if (loop.size())
             {
                 // Cell is cut. Uses only anchor points and loop itself.
                 forAll(loop, fp)
@@ -740,7 +734,7 @@ void Foam::meshCutAndRemove::setRefinement
                 {
                     usedPoint[cPoints[i]] = true;
                 }
-            }   
+            }
         }
 
 
@@ -822,7 +816,7 @@ void Foam::meshCutAndRemove::setRefinement
     {
         const labelList& loop = cellLoops[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             if (cutPatch[cellI] < 0 || cutPatch[cellI] >= patches.size())
             {
@@ -918,7 +912,7 @@ void Foam::meshCutAndRemove::setRefinement
 
         // Renumber face to include split edges.
         face newFace(addEdgeCutsToFace(faceI));
-        
+
         // Edge splitting the face. Convert edge to new vertex numbering.
         const edge& splitEdge = iter();
 
@@ -984,7 +978,7 @@ void Foam::meshCutAndRemove::setRefinement
         label f0Own = -1;
         label f1Own = -1;
 
-        if (cellLoops[own].size() == 0)
+        if (cellLoops[own].empty())
         {
             // Owner side is not split so keep both halves.
             f0Own = own;
@@ -1031,7 +1025,7 @@ void Foam::meshCutAndRemove::setRefinement
 
         if (nei != -1)
         {
-            if (cellLoops[nei].size() == 0)
+            if (cellLoops[nei].empty())
             {
                 f0Nei = nei;
                 f1Nei = nei;
@@ -1097,7 +1091,7 @@ void Foam::meshCutAndRemove::setRefinement
         bool modifiedFaceI = false;
 
         if (f0Own == -1)
-        {   
+        {
             if (f0Nei != -1)
             {
                 // f0 becomes external face (note:modFace will reverse face)
@@ -1125,7 +1119,7 @@ void Foam::meshCutAndRemove::setRefinement
         // f1 is added face (if at all)
 
         if (f1Own == -1)
-        {   
+        {
             if (f1Nei == -1)
             {
                 // f1 not needed.
@@ -1225,7 +1219,7 @@ void Foam::meshCutAndRemove::setRefinement
         {
             const labelList& eFaces = mesh().edgeFaces()[edgeI];
 
-            forAll(eFaces, i)    
+            forAll(eFaces, i)
             {
                 label faceI = eFaces[i];
 
@@ -1397,7 +1391,7 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
                     (debug & 2)
                  && (e != newE || newAddedPointI != addedPointI)
                 )
-                {        
+                {
                     Pout<< "meshCutAndRemove::updateMesh :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointI
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index e13c0a738b..6a97db6256 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -39,12 +39,7 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(meshCutter, 0);
-
-}
+defineTypeNameAndDebug(Foam::meshCutter, 0);
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
@@ -111,12 +106,12 @@ Foam::label Foam::meshCutter::findCutCell
     {
         label cellI = cellLabels[labelI];
 
-        if (cuts.cellLoops()[cellI].size() > 0)
+        if (cuts.cellLoops()[cellI].size())
         {
             return cellI;
         }
     }
-    return -1;        
+    return -1;
 }
 
 
@@ -146,7 +141,7 @@ Foam::label Foam::meshCutter::findInternalFacePoint
         }
     }
 
-    if (pointLabels.size() == 0)
+    if (pointLabels.empty())
     {
         FatalErrorIn("meshCutter::findInternalFacePoint(const labelList&)")
             << "Empty pointLabels" << abort(FatalError);
@@ -173,7 +168,7 @@ void Foam::meshCutter::faceCells
 
     own = mesh().faceOwner()[faceI];
 
-    if (cellLoops[own].size() > 0 && uses(f, anchorPts[own]))
+    if (cellLoops[own].size() && uses(f, anchorPts[own]))
     {
         own = addedCells_[own];
     }
@@ -184,7 +179,7 @@ void Foam::meshCutter::faceCells
     {
         nei = mesh().faceNeighbour()[faceI];
 
-        if (cellLoops[nei].size() > 0 && uses(f, anchorPts[nei]))
+        if (cellLoops[nei].size() && uses(f, anchorPts[nei]))
         {
             nei = addedCells_[nei];
         }
@@ -653,7 +648,7 @@ void Foam::meshCutter::setRefinement
 
     forAll(cellLoops, cellI)
     {
-        if (cellLoops[cellI].size() > 0)
+        if (cellLoops[cellI].size())
         {
             // Add a cell to the existing cell
             label addedCellI =
@@ -688,7 +683,7 @@ void Foam::meshCutter::setRefinement
     {
         const labelList& loop = cellLoops[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             //
             // Convert loop (=list of cuts) into proper face.
@@ -769,7 +764,7 @@ void Foam::meshCutter::setRefinement
 
         // Renumber face to include split edges.
         face newFace(addEdgeCutsToFace(faceI));
-        
+
         // Edge splitting the face. Convert cuts to new vertex numbering.
         const edge& splitEdge = iter();
 
@@ -832,7 +827,7 @@ void Foam::meshCutter::setRefinement
         label f0Owner = -1;
         label f1Owner = -1;
 
-        if (cellLoops[own].size() == 0)
+        if (cellLoops[own].empty())
         {
             f0Owner = own;
             f1Owner = own;
@@ -875,7 +870,7 @@ void Foam::meshCutter::setRefinement
 
         if (nei != -1)
         {
-            if (cellLoops[nei].size() == 0)
+            if (cellLoops[nei].empty())
             {
                 f0Neighbour = nei;
                 f1Neighbour = nei;
@@ -935,7 +930,7 @@ void Foam::meshCutter::setRefinement
         {
             const labelList& eFaces = mesh().edgeFaces()[edgeI];
 
-            forAll(eFaces, i)    
+            forAll(eFaces, i)
             {
                 label faceI = eFaces[i];
 
@@ -970,7 +965,7 @@ void Foam::meshCutter::setRefinement
 
     forAll(cellLoops, cellI)
     {
-        if (cellLoops[cellI].size() > 0)
+        if (cellLoops[cellI].size())
         {
             const labelList& cllFaces = mesh().cells()[cellI];
 
@@ -991,7 +986,7 @@ void Foam::meshCutter::setRefinement
                             ", polyTopoChange&)"
                         )   << "Problem: edges added to face which does "
                             << " not use a marked cut" << endl
-                            << "faceI:" << faceI << endl    
+                            << "faceI:" << faceI << endl
                             << "face:" << f << endl
                             << "newFace:" << addEdgeCutsToFace(faceI)
                             << abort(FatalError);
@@ -1000,7 +995,7 @@ void Foam::meshCutter::setRefinement
                     // Get (new or original) owner and neighbour of faceI
                     label own, nei;
                     faceCells(cuts, faceI, own, nei);
-                    
+
                     modFace
                     (
                         meshMod,
@@ -1142,7 +1137,7 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
                     (debug & 2)
                  && (e != newE || newAddedPointI != addedPointI)
                 )
-                {        
+                {
                     Pout<< "meshCutter::updateMesh :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointI
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index de9f54ac39..60a27f5365 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -196,7 +196,7 @@ void Foam::multiDirRefinement::addCells
 
         labelList& added = addedCells_[masterI];
 
-        if (added.size() == 0)
+        if (added.empty())
         {
             added.setSize(2);
             added[0] = masterI;
@@ -383,7 +383,7 @@ void Foam::multiDirRefinement::refineHex8
     {
         label oldCellI = cellMap[cellI];
 
-        if (addedCells_[oldCellI].size() > 0)
+        if (addedCells_[oldCellI].size())
         {
             addedCells_[oldCellI][nAddedCells[oldCellI]++] = cellI;
         }
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 3015274ba5..5307352302 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -826,7 +826,7 @@ bool Foam::motionSmoother::scaleMesh
     const label nAllowableErrors
 )
 {
-    if (!smoothMesh && adaptPatchIDs_.size() == 0)
+    if (!smoothMesh && adaptPatchIDs_.empty())
     {
         FatalErrorIn("motionSmoother::scaleMesh(const bool")
             << "You specified both no movement on the internal mesh points"
@@ -992,7 +992,7 @@ bool Foam::motionSmoother::scaleMesh
                 << endl;
         }
 
-        if (adaptPatchIDs_.size() != 0)
+        if (adaptPatchIDs_.size())
         {
             // Scale conflicting patch points
             scaleField(pp_.meshPoints(), usedPoints, errorReduction, scale_);
@@ -1005,7 +1005,7 @@ bool Foam::motionSmoother::scaleMesh
 
         for (label i = 0; i < nSmoothScale; i++)
         {
-            if (adaptPatchIDs_.size() != 0)
+            if (adaptPatchIDs_.size())
             {
                 // Smooth patch values
                 pointScalarField oldScale(scale_);
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index b8a028b84b..237a2f3cb7 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -36,12 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(faceCoupleInfo, 0);
-
-}
+defineTypeNameAndDebug(Foam::faceCoupleInfo, 0);
 
 const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1E-3;
 
@@ -541,7 +536,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
 
         const labelList& stringedEdges = masterToCutEdges[masterEdgeI];
 
-        if (stringedEdges.size() == 0)
+        if (stringedEdges.empty())
         {
             FatalErrorIn
             (
@@ -1421,16 +1416,15 @@ Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
             {
                 label masterFaceI = masterFaces[i];
 
-                if (masterToCutFaces[masterFaces[i]].size() == 0)
+                if (masterToCutFaces[masterFaces[i]].empty())
                 {
-                    scalar dist =
-                        maxDistance
-                        (
-                            cutF,
-                            cutPoints,
-                            masterPatch()[masterFaceI],
-                            masterPatch().points()
-                        );
+                    scalar dist = maxDistance
+                    (
+                        cutF,
+                        cutPoints,
+                        masterPatch()[masterFaceI],
+                        masterPatch().points()
+                    );
 
                     if (dist < minDist)
                     {
@@ -2065,7 +2059,7 @@ Foam::faceCoupleInfo::faceCoupleInfo
 
     if
     (
-        masterAddressing.size() > 0
+        masterAddressing.size()
      && min(masterAddressing) < masterMesh.nInternalFaces()
     )
     {
@@ -2079,7 +2073,7 @@ Foam::faceCoupleInfo::faceCoupleInfo
     }
     if
     (
-        slaveAddressing.size() > 0
+        slaveAddressing.size()
      && min(slaveAddressing) < slaveMesh.nInternalFaces()
     )
     {
@@ -2156,7 +2150,7 @@ Foam::Map<Foam::labelList> Foam::faceCoupleInfo::makeMap
 
     forAll(lst, i)
     {
-        if (lst[i].size() > 0)
+        if (lst[i].size())
         {
             map.insert(i, lst[i]);
         }
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index 8d5a04c780..e2e6a00582 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -55,7 +55,7 @@ class IOobject;
 class polyTopoChange;
 
 /*---------------------------------------------------------------------------*\
-                           Class polyMeshAdder Declaration
+                        Class polyMeshAdder Declaration
 \*---------------------------------------------------------------------------*/
 
 class polyMeshAdder
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index 1dd63f38c8..73b285f74e 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -85,16 +85,15 @@ void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
 
         forAll (oldPatches, patchI)
         {
-            if (oldPatches[patchI].size() > 0)
+            if (oldPatches[patchI].size())
             {
-                newPatches[nNewPatches] =
-                    oldPatches[patchI].clone
-                    (
-                        mesh_.boundaryMesh(),
-                        nNewPatches,
-                        oldPatches[patchI].size(),
-                        oldPatches[patchI].start()
-                    ).ptr();
+                newPatches[nNewPatches] = oldPatches[patchI].clone
+                (
+                    mesh_.boundaryMesh(),
+                    nNewPatches,
+                    oldPatches[patchI].size(),
+                    oldPatches[patchI].start()
+                ).ptr();
 
                 nNewPatches++;
             }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 65836c81c8..6015f1b64a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -196,8 +196,8 @@ bool Foam::addPatchCellLayer::sameEdgeNeighbour
     return
         !doneEdge[edgeI]                            // not yet handled
      && (
-            addedPoints_[e[0]].size() != 0          // is extruded
-         || addedPoints_[e[1]].size() != 0
+            addedPoints_[e[0]].size()               // is extruded
+         || addedPoints_[e[1]].size()
         )
      && (
             nbrFace(globalEdgeFaces, edgeI, thisGlobalFaceI)
@@ -232,10 +232,7 @@ Foam::labelPair Foam::addPatchCellLayer::getEdgeString
         if
         (
             !doneEdge[edgeI]
-         && (
-                addedPoints_[e[0]].size() != 0
-             || addedPoints_[e[1]].size() != 0
-            )
+         && ( addedPoints_[e[0]].size() || addedPoints_[e[1]].size() )
         )
         {
             startFp = fp;
@@ -529,7 +526,7 @@ Foam::labelListList Foam::addPatchCellLayer::addedCells
     {
         const labelList& faceLabels = layerFaces[patchFaceI];
 
-        if (faceLabels.size() > 0)
+        if (faceLabels.size())
         {
             labelList& added = layerCells[patchFaceI];
             added.setSize(faceLabels.size()-1);
@@ -862,7 +859,7 @@ void Foam::addPatchCellLayer::setRefinement
 
     forAll(firstLayerDisp, patchPointI)
     {
-        if (addedPoints_[patchPointI].size() > 0)
+        if (addedPoints_[patchPointI].size())
         {
             label meshPointI = meshPoints[patchPointI];
 
@@ -965,7 +962,7 @@ void Foam::addPatchCellLayer::setRefinement
     {
         label meshFaceI = pp.addressing()[patchFaceI];
 
-        if (addedCells[patchFaceI].size() > 0)
+        if (addedCells[patchFaceI].size())
         {
             layerFaces_[patchFaceI].setSize(addedCells[patchFaceI].size() + 1);
             layerFaces_[patchFaceI][0] = meshFaceI;
@@ -981,7 +978,7 @@ void Foam::addPatchCellLayer::setRefinement
             {
                 forAll(f, fp)
                 {
-                    if (addedPoints_[f[fp]].size() == 0)
+                    if (addedPoints_[f[fp]].empty())
                     {
                         // Keep original point
                         newFace[fp] = meshPoints[f[fp]];
@@ -1045,7 +1042,7 @@ void Foam::addPatchCellLayer::setRefinement
     //
     forAll(pp, patchFaceI)
     {
-        if (addedCells[patchFaceI].size() > 0)
+        if (addedCells[patchFaceI].size())
         {
             label meshFaceI = pp.addressing()[patchFaceI];
 
@@ -1235,15 +1232,15 @@ void Foam::addPatchCellLayer::setRefinement
                     {
                         // layer 0 gets all the truncation of neighbouring
                         // faces with more layers.
-                        if (addedPoints_[vEnd].size() != 0)
+                        if (addedPoints_[vEnd].size())
                         {
-                            newFp +=
+                            newFp += 
                                 addedPoints_[vEnd].size() - numEdgeSideFaces;
                         }
-                        if (addedPoints_[vStart].size() != 0)
+                        if (addedPoints_[vStart].size())
                         {
                             newFp +=
-                                addedPoints_[vStart].size()  - numEdgeSideFaces;
+                                addedPoints_[vStart].size() - numEdgeSideFaces;
                         }
                     }
 
@@ -1266,7 +1263,7 @@ void Foam::addPatchCellLayer::setRefinement
                         forAll(stringedVerts, stringedI)
                         {
                             label v = stringedVerts[stringedI];
-                            if (addedPoints_[v].size() > 0)
+                            if (addedPoints_[v].size())
                             {
                                 label offset =
                                     addedPoints_[v].size() - numEdgeSideFaces;
@@ -1287,7 +1284,7 @@ void Foam::addPatchCellLayer::setRefinement
                     // add points between stringed vertices (end)
                     if (numEdgeSideFaces < addedPoints_[vEnd].size())
                     {
-                        if (i == 0 && addedPoints_[vEnd].size() != 0)
+                        if (i == 0 && addedPoints_[vEnd].size())
                         {
                             label offset =
                                 addedPoints_[vEnd].size() - numEdgeSideFaces;
@@ -1306,7 +1303,7 @@ void Foam::addPatchCellLayer::setRefinement
                     forAllReverse(stringedVerts, stringedI)
                     {
                         label v = stringedVerts[stringedI];
-                        if (addedPoints_[v].size() > 0)
+                        if (addedPoints_[v].size())
                         {
                             label offset =
                                 addedPoints_[v].size() - numEdgeSideFaces;
@@ -1327,7 +1324,7 @@ void Foam::addPatchCellLayer::setRefinement
                     // add points between stringed vertices (start)
                     if (numEdgeSideFaces < addedPoints_[vStart].size())
                     {
-                        if (i == 0 && addedPoints_[vStart].size() != 0)
+                        if (i == 0 && addedPoints_[vStart].size())
                         {
                             label offset =
                                 addedPoints_[vStart].size() - numEdgeSideFaces;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index a1bb3f24db..ea6a7674e4 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -135,9 +135,9 @@ class addPatchCellLayer
 
             void operator()(labelList& x, const labelList& y) const
             {
-                if (x.size() == 0)
+                if (x.empty())
                 {
-                    if (y.size() > 0)
+                    if (y.size())
                     {
                         x = y;
                     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 59cbdfd408..caa3642f5c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -897,7 +897,7 @@ void Foam::combineFaces::setUnrefinement
 
         faceList& faces = faceSetsVertices_[setI];
 
-        if (faces.size() == 0)
+        if (faces.empty())
         {
             FatalErrorIn
             (
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 0d2e4cb2cf..53357139ac 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -304,7 +304,7 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
 
             label freeRegion = -1;
 
-            if (freeRegions_.size() > 0)
+            if (freeRegions_.size())
             {
                 freeRegion = freeRegions_.removeHead();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 57a9738861..3bb5c345d3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -441,7 +441,7 @@ void Foam::faceCollapser::setRefinement
                 }
             }
 
-            if (edgePoints.size() > 0)
+            if (edgePoints.size())
             {
                 edgePoints.shrink();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index ca81927fcc..fa5ae3ae9d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -532,7 +532,7 @@ Foam::label Foam::hexRef8::getAnchorCell
     const label pointI
 ) const
 {
-    if (cellAnchorPoints[cellI].size() > 0)
+    if (cellAnchorPoints[cellI].size())
     {
         label index = findIndex(cellAnchorPoints[cellI], pointI);
 
@@ -4017,7 +4017,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
         {
             const labelList& addedCells = cellAddedCells[cellI];
 
-            if (addedCells.size() > 0)
+            if (addedCells.size())
             {
                 // Cell was split.
                 history_.storeSplit(cellI, addedCells);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
index d54c1bd92d..76a38381e8 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
@@ -45,7 +45,7 @@ public:
 
     void operator()(face& x, const face& y) const
     {
-        if (x.size() > 0)
+        if (x.size())
         {
             label j = 0;
             forAll(x, i)
@@ -134,7 +134,7 @@ void Foam::localPointRegion::countPointRegions
         {
             const face& f = mesh.faces()[faceI];
 
-            if (minRegion[faceI].size() == 0)
+            if (minRegion[faceI].empty())
             {
                 FatalErrorIn("localPointRegion::countPointRegions(..)")
                     << "Face from candidateFace without minRegion set." << endl
@@ -364,7 +364,7 @@ void Foam::localPointRegion::calcPointRegions
             {
                 label faceI = cFaces[cFaceI];
 
-                if (minRegion[faceI].size() > 0)
+                if (minRegion[faceI].size())
                 {
                     const face& f = mesh.faces()[faceI];
 
@@ -391,7 +391,7 @@ void Foam::localPointRegion::calcPointRegions
             {
                 label faceI = cFaces[cFaceI];
 
-                if (minRegion[faceI].size() > 0)
+                if (minRegion[faceI].size())
                 {
                     const face& f = mesh.faces()[faceI];
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 2c7502ebca..05204fb1b0 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -286,7 +286,7 @@ void Foam::polyTopoChange::getMergeSets
 
             objectMap& mergeSet = cellsFromCells[setI];
 
-            if (mergeSet.masterObjects().size() == 0)
+            if (mergeSet.masterObjects().empty())
             {
                 // First occurrence of master cell mergeCellI
 
@@ -569,7 +569,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
                     }
                 }
             }
-            while (nextCell.size() > 0);
+            while (nextCell.size());
         }
     }
 
@@ -1223,7 +1223,7 @@ void Foam::polyTopoChange::calcFaceInflationMaps
 
     facesFromPoints.setSize(faceFromPoint_.size());
 
-    if (faceFromPoint_.size() > 0)
+    if (faceFromPoint_.size())
     {
         label nFacesFromPoints = 0;
 
@@ -1269,7 +1269,7 @@ void Foam::polyTopoChange::calcFaceInflationMaps
 
     facesFromEdges.setSize(faceFromEdge_.size());
 
-    if (faceFromEdge_.size() > 0)
+    if (faceFromEdge_.size())
     {
         label nFacesFromEdges = 0;
 
@@ -1333,7 +1333,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 {
     cellsFromPoints.setSize(cellFromPoint_.size());
 
-    if (cellFromPoint_.size() > 0)
+    if (cellFromPoint_.size())
     {
         label nCellsFromPoints = 0;
 
@@ -1351,7 +1351,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 
     cellsFromEdges.setSize(cellFromEdge_.size());
 
-    if (cellFromEdge_.size() > 0)
+    if (cellFromEdge_.size())
     {
         label nCellsFromEdges = 0;
 
@@ -1369,7 +1369,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 
     cellsFromFaces.setSize(cellFromFace_.size());
 
-    if (cellFromFace_.size() > 0)
+    if (cellFromFace_.size())
     {
         label nCellsFromFaces = 0;
 
@@ -2952,9 +2952,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
         mesh.resetPrimitives
         (
             xferMove(renumberedMeshPoints),
-            xferMoveTo<faceList>(faces_),
-            xferMoveTo<labelList>(faceOwner_),
-            xferMoveTo<labelList>(faceNeighbour_),
+            faces_.xfer(),
+            faceOwner_.xfer(),
+            faceNeighbour_.xfer(),
             patchSizes,
             patchStarts,
             syncParallel
@@ -2968,9 +2968,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
         mesh.resetPrimitives
         (
             xferMove(newPoints),
-            xferMoveTo<faceList>(faces_),
-            xferMoveTo<labelList>(faceOwner_),
-            xferMoveTo<labelList>(faceNeighbour_),
+            faces_.xfer(),
+            faceOwner_.xfer(),
+            faceNeighbour_.xfer(),
             patchSizes,
             patchStarts,
             syncParallel
@@ -3195,9 +3195,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
         (
             io,
             xferMove(newPoints),
-            xferMoveTo<faceList>(faces_),
-            xferMoveTo<labelList>(faceOwner_),
-            xferMoveTo<labelList>(faceNeighbour_)
+            faces_.xfer(),
+            faceOwner_.xfer(),
+            faceNeighbour_.xfer()
         )
     );
     fvMesh& newMesh = newMeshPtr();
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
index 67edf19ff6..e2ea3c2869 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
@@ -40,7 +40,7 @@ inline bool Foam::polyTopoChange::pointRemoved(const label pointI) const
 
 inline bool Foam::polyTopoChange::faceRemoved(const label faceI) const
 {
-    return faces_[faceI].size() == 0;
+    return faces_[faceI].empty();
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
index fb3b354d1f..4d3f6d9696 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
@@ -62,6 +62,7 @@ void Foam::refinementHistory::writeEntry
             << " no subcells"
             << endl;
     }
+
     if (split.parent_ >= 0)
     {
         Pout<< "parent data:" << endl;
@@ -152,7 +153,7 @@ Foam::Istream& Foam::operator>>(Istream& is, refinementHistory::splitCell8& sc)
 
     is >> sc.parent_ >> addedCells;
 
-    if (addedCells.size() > 0)
+    if (addedCells.size())
     {
         sc.addedCellsPtr_.reset(new FixedList<label, 8>(addedCells));
     }
@@ -215,7 +216,7 @@ Foam::label Foam::refinementHistory::allocateSplitCell
 {
     label index = -1;
 
-    if (freeSplitCells_.size() > 0)
+    if (freeSplitCells_.size())
     {
         index = freeSplitCells_.remove();
 
@@ -234,7 +235,7 @@ Foam::label Foam::refinementHistory::allocateSplitCell
     {
         splitCell8& parentSplit = splitCells_[parent];
 
-        if (!parentSplit.addedCellsPtr_.valid())
+        if (parentSplit.addedCellsPtr_.empty())
         {
             // Allocate storage on parent for the 8 subcells.
             parentSplit.addedCellsPtr_.reset(new FixedList<label, 8>(-1));
@@ -406,7 +407,7 @@ Foam::refinementHistory::refinementHistory
     )
     {
         readStream(typeName) >> *this;
-        close();        
+        close();
     }
     else
     {
@@ -497,7 +498,7 @@ void Foam::refinementHistory::resize(const label size)
     }
 }
 
-    
+
 void Foam::refinementHistory::updateMesh(const mapPolyMesh& map)
 {
     if (active())
@@ -514,7 +515,7 @@ void Foam::refinementHistory::updateMesh(const mapPolyMesh& map)
             {
                 label index = visibleCells_[cellI];
 
-                // Check
+                // Check not already set
                 if (splitCells_[index].addedCellsPtr_.valid())
                 {
                     FatalErrorIn
@@ -974,7 +975,7 @@ void Foam::refinementHistory::compact()
         else if
         (
             splitCells_[index].parent_ == -1
-         && !splitCells_[index].addedCellsPtr_.valid()
+         && splitCells_[index].addedCellsPtr_.empty()
         )
         {
             // recombined cell. No need to keep since no parent and no subsplits
@@ -989,7 +990,7 @@ void Foam::refinementHistory::compact()
 
 
     // Now oldToNew is fully complete and compacted elements are in
-    // newSplitCells. 
+    // newSplitCells.
     // Renumber contents of newSplitCells and visibleCells.
     forAll(newSplitCells, index)
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index c6463c557c..0ea48b115f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -74,7 +74,7 @@ class removePoints
             {
                 if (y.size() > 0)
                 {
-                    if (x.size() == 0)
+                    if (x.empty())
                     {
                         x = y;
                     }
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
index 69c798491a..2cb88d9f34 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
@@ -40,7 +40,7 @@ Description
 
 Foam::polyTopoChange& Foam::repatchPolyTopoChanger::meshMod()
 {
-    if (!meshModPtr_.valid())
+    if (meshModPtr_.empty())
     {
         meshModPtr_.reset(new polyTopoChange(mesh_));
     }
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index c7003c5e14..82e77d7674 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -1277,7 +1277,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                             // Get points on current edge
                             const labelList& curPime = pime[curEdges[curEdgeI]];
 
-                            if (curPime.size() > 0)
+                            if (curPime.size())
                             {
                                 changed = true;
                                 // Pout << "curPime: " << curPime << endl;
@@ -1562,7 +1562,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                             // Get points on current edge
                             const labelList& curPise = pise[curEdges[curEdgeI]];
 
-                            if (curPise.size() > 0)
+                            if (curPise.size())
                             {
                                 changed = true;
 //                                 Pout << "curPise: " << curPise << endl;
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 6b090fb0d4..d15a6ddea5 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -151,7 +151,7 @@ void Foam::enrichedPatch::calcCutFaces() const
         vector normal = curLocalFace.normal(lp);
         normal /= mag(normal);
 
-        while (edgeSeeds.size() > 0)
+        while (edgeSeeds.size())
         {
 //             Pout << "edgeSeeds.size(): " << edgeSeeds.size() << endl;
             const edge curEdge = edgeSeeds.removeHead();
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 85f01c7d37..bad4dd118e 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -136,7 +136,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 //             Info << "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
             // If there are no points on the edge, skip everything
             // If there is only one point, no need for sorting
-            if (slavePointsOnEdge.size() > 0)
+            if (slavePointsOnEdge.size())
             {
                 // Sort edge points in order
                 scalarField edgePointWeights(slavePointsOnEdge.size());
@@ -287,7 +287,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
             // If there are no points on the edge, skip everything
             // If there is only one point, no need for sorting
-            if (masterPointsOnEdge.size() > 0)
+            if (masterPointsOnEdge.size())
             {
                 // Sort edge points in order
                 scalarField edgePointWeights(masterPointsOnEdge.size());
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 78b0581331..0f8dd3603a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -90,8 +90,8 @@ void Foam::slidingInterface::checkDefinition()
     // Check the sizes and set up state
     if
     (
-        mesh.faceZones()[masterFaceZoneID_.index()].size() == 0
-     || mesh.faceZones()[slaveFaceZoneID_.index()].size() == 0
+        mesh.faceZones()[masterFaceZoneID_.index()].empty()
+     || mesh.faceZones()[slaveFaceZoneID_.index()].empty()
     )
     {
         FatalErrorIn("void slidingInterface::checkDefinition()")
@@ -431,7 +431,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
     // Get point from the cut zone
     const labelList& cutPoints = mesh.pointZones()[cutPointZoneID_.index()];
 
-    if (cutPoints.size() > 0 && !projectedSlavePointsPtr_)
+    if (cutPoints.size() && !projectedSlavePointsPtr_)
     {
         return;
     }
diff --git a/src/edgeMesh/edgeMesh.C b/src/edgeMesh/edgeMesh.C
index bfe83b5cba..6a3933c84f 100644
--- a/src/edgeMesh/edgeMesh.C
+++ b/src/edgeMesh/edgeMesh.C
@@ -30,12 +30,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void edgeMesh::calcPointEdges() const
+void Foam::edgeMesh::calcPointEdges() const
 {
     if (pointEdgesPtr_.valid())
     {
@@ -81,7 +78,7 @@ void edgeMesh::calcPointEdges() const
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // construct from components
-edgeMesh::edgeMesh(const pointField& points, const edgeList& edges)
+Foam::edgeMesh::edgeMesh(const pointField& points, const edgeList& edges)
 :
     points_(points),
     edges_(edges)
@@ -89,7 +86,7 @@ edgeMesh::edgeMesh(const pointField& points, const edgeList& edges)
 
 
 // construct as copy
-edgeMesh::edgeMesh(const edgeMesh& em)
+Foam::edgeMesh::edgeMesh(const edgeMesh& em)
 :
     points_(em.points_),
     edges_(em.edges_),
@@ -99,7 +96,7 @@ edgeMesh::edgeMesh(const edgeMesh& em)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-label edgeMesh::regions(labelList& edgeRegion) const
+Foam::label Foam::edgeMesh::regions(labelList& edgeRegion) const
 {
     edgeRegion.setSize(edges_.size());
     edgeRegion = -1;
@@ -126,7 +123,7 @@ label edgeMesh::regions(labelList& edgeRegion) const
         edgeRegion[startEdgeI] = currentRegion;
         labelList edgesToVisit(1, startEdgeI);
 
-        while (edgesToVisit.size() > 0)
+        while (edgesToVisit.size())
         {
             // neighbours of current edgesToVisit
             DynamicList<label> newEdgesToVisit(edgesToVisit.size());
@@ -165,7 +162,7 @@ label edgeMesh::regions(labelList& edgeRegion) const
 }
 
 
-void edgeMesh::mergePoints(const scalar mergeDist)
+void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 {
     pointField newPoints;
     labelList pointMap;
@@ -245,7 +242,7 @@ void edgeMesh::mergePoints(const scalar mergeDist)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void edgeMesh::operator=(const edgeMesh& rhs)
+void Foam::edgeMesh::operator=(const edgeMesh& rhs)
 {
     points_ = rhs.points_;
     edges_ = rhs.edges_;
@@ -253,8 +250,4 @@ void edgeMesh::operator=(const edgeMesh& rhs)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/edgeMesh/edgeMeshI.H b/src/edgeMesh/edgeMeshI.H
index b5e8d36961..85951e8735 100644
--- a/src/edgeMesh/edgeMeshI.H
+++ b/src/edgeMesh/edgeMeshI.H
@@ -24,10 +24,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -40,21 +36,21 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const pointField& edgeMesh::points() const
+inline const Foam::pointField& Foam::edgeMesh::points() const
 {
     return points_;
 }
 
 
-inline const edgeList& edgeMesh::edges() const
+inline const Foam::edgeList& Foam::edgeMesh::edges() const
 {
     return edges_;
 }
 
 
-inline const labelListList& edgeMesh::pointEdges() const
+inline const Foam::labelListList& Foam::edgeMesh::pointEdges() const
 {
-    if (!pointEdgesPtr_.valid())
+    if (pointEdgesPtr_.empty())
     {
         calcPointEdges();
     }
@@ -73,6 +69,4 @@ inline const labelListList& edgeMesh::pointEdges() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/edgeMesh/edgeMeshIO.C b/src/edgeMesh/edgeMeshIO.C
index 66ca35dc78..e2dffb864b 100644
--- a/src/edgeMesh/edgeMeshIO.C
+++ b/src/edgeMesh/edgeMeshIO.C
@@ -27,15 +27,11 @@ License
 #include "edgeMesh.H"
 #include "IFstream.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // construct from file
-edgeMesh::edgeMesh(const fileName& fname)
+Foam::edgeMesh::edgeMesh(const fileName& fname)
 :
     points_(0),
     edges_(0),
@@ -57,7 +53,7 @@ edgeMesh::edgeMesh(const fileName& fname)
 
 
 // construct from Istream
-edgeMesh::edgeMesh(Istream& is)
+Foam::edgeMesh::edgeMesh(Istream& is)
 :
     points_(is),
     edges_(is),
@@ -70,7 +66,7 @@ edgeMesh::edgeMesh(Istream& is)
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Ostream& operator<<(Ostream& os, const edgeMesh& em)
+Foam::Ostream& Foam::operator<<(Ostream& os, const edgeMesh& em)
 {
     os  << em.points_ << nl << em.edges_ << endl;
 
@@ -81,7 +77,7 @@ Ostream& operator<<(Ostream& os, const edgeMesh& em)
 }
 
 
-Istream& operator>>(Istream& is, edgeMesh& em)
+Foam::Istream& Foam::operator>>(Istream& is, edgeMesh& em)
 {
     is >> em.points_ >> em.edges_;
 
@@ -92,8 +88,4 @@ Istream& operator>>(Istream& is, edgeMesh& em)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 89fc89bfcb..78bf174535 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -131,7 +131,7 @@ void fanFvPatchField<Type>::autoMap
     jumpCyclicFvPatchField<Type>::autoMap(m);
 
     // Jump is half size. Expand to full size, map and truncate.
-    if (jump_.size() > 0 && jump_.size() == this->size()/2)
+    if (jump_.size() && jump_.size() == this->size()/2)
     {
         label oldSize = jump_.size();
         jump_.setSize(this->size());
@@ -157,7 +157,7 @@ void fanFvPatchField<Type>::rmap
     jumpCyclicFvPatchField<Type>::rmap(ptf, addr);
 
     // Jump is half size. Expand to full size, map and truncate.
-    if (jump_.size() > 0 && jump_.size() == this->size()/2)
+    if (jump_.size() && jump_.size() == this->size()/2)
     {
         label oldSize = jump_.size();
         jump_.setSize(this->size());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 3465757afb..d29b694aca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -207,7 +207,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
 )
 {
     fixedValueFvPatchField<Type>::autoMap(m);
-    if (startSampledValues_.size() > 0)
+    if (startSampledValues_.size())
     {
         startSampledValues_.autoMap(m);
         endSampledValues_.autoMap(m);
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 4f87176be1..979d85e0d1 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -358,11 +358,7 @@ ITstream& fvSchemes::ddtScheme(const word& name) const
         Info<< "Lookup ddtScheme for " << name << endl;
     }
 
-    if
-    (
-        ddtSchemes_.found(name)
-     || !defaultDdtScheme_.size()
-    )
+    if (ddtSchemes_.found(name) || defaultDdtScheme_.empty())
     {
         return ddtSchemes_.lookup(name);
     }
@@ -381,11 +377,7 @@ ITstream& fvSchemes::d2dt2Scheme(const word& name) const
         Info<< "Lookup d2dt2Scheme for " << name << endl;
     }
 
-    if
-    (
-        d2dt2Schemes_.found(name)
-     || !defaultD2dt2Scheme_.size()
-    )
+    if (d2dt2Schemes_.found(name) || defaultD2dt2Scheme_.empty())
     {
         return d2dt2Schemes_.lookup(name);
     }
@@ -407,7 +399,7 @@ ITstream& fvSchemes::interpolationScheme(const word& name) const
     if
     (
         interpolationSchemes_.found(name)
-     || !defaultInterpolationScheme_.size()
+     || defaultInterpolationScheme_.empty()
     )
     {
         return interpolationSchemes_.lookup(name);
@@ -427,7 +419,7 @@ ITstream& fvSchemes::divScheme(const word& name) const
         Info<< "Lookup divScheme for " << name << endl;
     }
 
-    if (divSchemes_.found(name) || !defaultDivScheme_.size())
+    if (divSchemes_.found(name) || defaultDivScheme_.empty())
     {
         return divSchemes_.lookup(name);
     }
@@ -446,7 +438,7 @@ ITstream& fvSchemes::gradScheme(const word& name) const
         Info<< "Lookup gradScheme for " << name << endl;
     }
 
-    if (gradSchemes_.found(name) || !defaultGradScheme_.size())
+    if (gradSchemes_.found(name) || defaultGradScheme_.empty())
     {
         return gradSchemes_.lookup(name);
     }
@@ -465,7 +457,7 @@ ITstream& fvSchemes::snGradScheme(const word& name) const
         Info<< "Lookup snGradScheme for " << name << endl;
     }
 
-    if (snGradSchemes_.found(name) || !defaultSnGradScheme_.size())
+    if (snGradSchemes_.found(name) || defaultSnGradScheme_.empty())
     {
         return snGradSchemes_.lookup(name);
     }
@@ -484,7 +476,7 @@ ITstream& fvSchemes::laplacianScheme(const word& name) const
         Info<< "Lookup laplacianScheme for " << name << endl;
     }
 
-    if (laplacianSchemes_.found(name) || !defaultLaplacianScheme_.size())
+    if (laplacianSchemes_.found(name) || defaultLaplacianScheme_.empty())
     {
         return laplacianSchemes_.lookup(name);
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
index b3d72c3b5a..1812d2648d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
@@ -245,9 +245,9 @@ void Foam::faceStencil::unionEqOp::operator()
     const labelList& y
 ) const
 {
-    if (y.size() > 0)
+    if (y.size())
     {
-        if (x.size() == 0)
+        if (x.empty())
         {
             x = y;
         }
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 8d47225f6c..1192ef2357 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -58,10 +58,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(fvMesh, 0);
-}
+defineTypeNameAndDebug(Foam::fvMesh, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -302,7 +299,7 @@ void Foam::fvMesh::addFvPatches
     const bool validBoundary
 )
 {
-    if (boundary().size() > 0)
+    if (boundary().size())
     {
         FatalErrorIn
         (
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 14257a587a..78beb96df6 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -48,7 +48,7 @@ namespace Foam
 
 bool Foam::fvMeshSubset::checkCellSubset() const
 {
-    if (!fvMeshSubsetPtr_.valid())
+    if (fvMeshSubsetPtr_.empty())
     {
         FatalErrorIn("bool fvMeshSubset::checkCellSubset() const")
             << "Mesh subset not set.  Please set the cell map using "
@@ -161,11 +161,11 @@ void Foam::fvMeshSubset::doCoupledPatches
                         nCellsUsingFace[pp.start()+i] = 3;
                         nUncoupled++;
                     }
-                }       
+                }
             }
         }
     }
- 
+
     // Do same for cyclics.
     forAll (oldPatches, oldPatchI)
     {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 2d58e88dd3..34a8419f4d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -135,7 +135,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
 
     scalar skewCoeff = 0.0;
 
-    if (Sf.internalField().size() > 0)
+    if (Sf.internalField().size())
     {
         skewCoeff = max(mag(SkewCorrVecs)/mag(d)).value();
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
index dfb7d4ac61..178d1d1b2a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
@@ -362,7 +362,7 @@ Foam::displacementInterpolationFvMotionSolver::curPoints() const
     vectorField zoneDisp(displacements_.size(), vector::zero);
     forAll(zoneDisp, zoneI)
     {
-        if (times_[zoneI].size() > 0)
+        if (times_[zoneI].size())
         {
             zoneDisp[zoneI] = interpolateXY
             (
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
index 5a289b7b5b..09dfcae98a 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
@@ -75,7 +75,7 @@ Foam::tmp<Foam::scalarField> Foam::inverseDistanceDiffusivity::y() const
 
     labelHashSet patchSet(mesh.boundaryMesh().patchSet(patchNames_));
 
-    if (patchSet.size() > 0)
+    if (patchSet.size())
     {
         return tmp<scalarField>
         (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index f6c4270d58..68e0151f85 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -136,10 +136,10 @@ surfaceSlipDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const searchableSurfaces& surfaceSlipDisplacementPointPatchVectorField::
-surfaces() const
+const searchableSurfaces&
+surfaceSlipDisplacementPointPatchVectorField::surfaces() const
 {
-    if (!surfacesPtr_.valid())
+    if (surfacesPtr_.empty())
     {
         surfacesPtr_.reset
         (
@@ -195,7 +195,7 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
     // Get fixed points (bit of a hack)
     const pointZone* zonePtr = NULL;
 
-    if (frozenPointsZone_.size() > 0)
+    if (frozenPointsZone_.size())
     {
         const pointZoneMesh& pZones = mesh.pointZones();
 
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index c3a57c5cd0..ec1d09a00f 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -231,7 +231,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
     facei_ = -1;
     scalar trackFraction = 0.0;
 
-    if (faces.size() == 0) // inside cell
+    if (faces.empty())  // inside cell
     {
         trackFraction = 1.0;
         position_ = endPosition;
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index aeee1e1844..d84f2bb195 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -172,7 +172,7 @@ void Foam::parcel::readFields
     }
 
     // read the liquid molar fractions
-    if (c.size() > 0)
+    if (c.size())
     {
         Cloud<parcel>::const_iterator iter = c.begin();
         const parcel& p0 = iter();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index 331f2df5bc..fce8ea2321 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -90,7 +90,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
  
     // check number of entries in innerConeAngle list
-    if (innerConeAngle_.size() < 1)
+    if (innerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
@@ -99,7 +99,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
 
     // check number of entries in outerConeAngle list
-    if (outerConeAngle_.size() < 1)
+    if (outerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
diff --git a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
index 6788cdcd28..a4a08b08fa 100644
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
@@ -232,11 +232,9 @@ void distribution::insertMissingKeys()
 
     sort(keys);
 
-    label k;
-
-    if (keys.size() > 0)
+    if (keys.size())
     {
-        for (k = keys[0]; k < keys[keys.size()-1]; k++)
+        for (label k = keys[0]; k < keys[keys.size()-1]; k++)
         {
             iter = find(k);
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index 1bc4d6bdbb..6bb5a43da3 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -35,11 +35,11 @@ void Foam::tetherPotentialList::readTetherPotentialDict
     const List<label>& tetherIds
 )
 {
-    if (!tetherIds.size())
+    if (tetherIds.empty())
     {
         Info<< nl << "No tethered molecules found." << endl;
 
-        idMap_.setSize(0);
+        idMap_.clear();
     }
     else
     {
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 3952f435d6..8bc65470bc 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -263,7 +263,7 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
             nbs.erase(nb);
         }
 
-        if (nbs.size() != 0)
+        if (nbs.size())
         {
             FatalErrorIn("getPointNeighbours")
                 << "Problem: fast pointNeighbours routine did not find "
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 4f9c3341fb..605624473b 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -282,7 +282,7 @@ void Foam::cellFeatures::calcSuperFaces() const
 
         label superFaceI = toSuperFace[faceI];
 
-        if (faces[superFaceI].size() == 0)
+        if (faces[superFaceI].empty())
         {
             // Superface not yet constructed.
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
index dfbbcee145..5d54517f0b 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
@@ -139,7 +139,7 @@ void Foam::directMappedPolyPatch::findSamples
     {
         case NEARESTCELL:
         {
-            if (samplePatch_.size() != 0 && samplePatch_ != "none")
+            if (samplePatch_.size() && samplePatch_ != "none")
             {
                 FatalErrorIn
                 (
@@ -196,7 +196,7 @@ void Foam::directMappedPolyPatch::findSamples
 
             const polyPatch& pp = boundaryMesh()[patchI];
 
-            if (pp.size() == 0)
+            if (pp.empty())
             {
                 forAll(samples, sampleI)
                 {
@@ -267,7 +267,7 @@ void Foam::directMappedPolyPatch::findSamples
 
         case NEARESTFACE:
         {
-            if (samplePatch_.size() != 0 && samplePatch_ != "none")
+            if (samplePatch_.size() && samplePatch_ != "none")
             {
                 FatalErrorIn
                 (
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
index 58c16ddd9c..413737aa80 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
@@ -292,7 +292,7 @@ public:
         //- Access to communication.
         const List<labelPair>& schedule() const
         {
-            if (!schedulePtr_.valid())
+            if (schedulePtr_.empty())
             {
                 calcMapping();
             }
@@ -307,7 +307,7 @@ public:
                 Pout<< "Asking for sendLabels." << endl;
             }
 
-            if (!sendLabelsPtr_.valid())
+            if (sendLabelsPtr_.empty())
             {
                 if (debug)
                 {
@@ -326,7 +326,7 @@ public:
                 Pout<< "Asking for receiveFaceLabels." << endl;
             }
 
-            if (!receiveFaceLabelsPtr_.valid())
+            if (receiveFaceLabelsPtr_.empty())
             {
                 if (debug)
                 {
diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/meshTools/indexedOctree/indexedOctree.C
index 233dac95f5..385fb2d314 100644
--- a/src/meshTools/indexedOctree/indexedOctree.C
+++ b/src/meshTools/indexedOctree/indexedOctree.C
@@ -224,7 +224,7 @@ Foam::indexedOctree<Type>::divide
     {
         labelList& subIndices = dividedIndices[octant];
 
-        if (subIndices.size() > 0)
+        if (subIndices.size())
         {
             if (!replaced)
             {
@@ -1052,7 +1052,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 {
     pointIndexHit hitInfo;
 
-    if (nodes_.size() > 0)
+    if (nodes_.size())
     {
         const treeBoundBox& treeBb = nodes_[0].bb_;
 
@@ -1457,11 +1457,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
     label nearestShapeI = -1;
     point nearestPoint;
 
-    if (nodes_.size() == 0)
-    {
-        nearestPoint = vector::zero;
-    }
-    else
+    if (nodes_.size())
     {
         findNearest
         (
@@ -1473,6 +1469,10 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
             nearestPoint
         );
     }
+    else
+    {
+        nearestPoint = vector::zero;
+    }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
 }
@@ -1489,11 +1489,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
     label nearestShapeI = -1;
     point nearestPoint;
 
-    if (nodes_.size() == 0)
-    {
-        nearestPoint = vector::zero;
-    }
-    else
+    if (nodes_.size())
     {
         findNearest
         (
@@ -1506,6 +1502,10 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
             nearestPoint
         );
     }
+    else
+    {
+        nearestPoint = vector::zero;
+    }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
 }
@@ -1544,7 +1544,7 @@ Foam::labelList Foam::indexedOctree<Type>::findBox
     // Storage for labels of shapes inside bb. Size estimate.
     labelHashSet elements(shapes_.size() / 100);
 
-    if (nodes_.size() > 0)
+    if (nodes_.size())
     {
         findBox(0, searchBox, elements);
     }
@@ -1561,7 +1561,7 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
     const point& sample
 ) const
 {
-    if (nodes_.size() == 0)
+    if (nodes_.empty())
     {
         // Empty tree. Return what?
         return nodePlusOctant(nodeI, 0);
@@ -1599,7 +1599,7 @@ Foam::indexedOctree<Type>::getVolumeType
     const point& sample
 ) const
 {
-    if (nodes_.size() == 0)
+    if (nodes_.empty())
     {
         return UNKNOWN;
     }
diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/meshTools/indexedOctree/indexedOctree.H
index 68e63626e4..b4aad9a305 100644
--- a/src/meshTools/indexedOctree/indexedOctree.H
+++ b/src/meshTools/indexedOctree/indexedOctree.H
@@ -372,7 +372,7 @@ public:
             //- Top bounding box
             const treeBoundBox& bb() const
             {
-                if (nodes_.size() == 0)
+                if (nodes_.empty())
                 {
                     FatalErrorIn("indexedOctree<Type>::bb() const")
                         << "Tree is empty" << abort(FatalError);
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index 0dbda8434a..554af3ad5a 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -621,12 +621,12 @@ void Foam::octree<Type>::printStats(Ostream& os) const
         << "  nLeaves  :" << nLeaves() << endl
         << "  nEntries :" << nEntries() << endl;
 
-    if (nLeaves() > 0 && shapes().size() > 0)
+    if (nLeaves() && shapes().size())
     {
         os
             << "  Cells per leaf :"
             << scalar(nEntries())/nLeaves()
-            << endl
+            << nl
             << "  Every cell in  :"
             << scalar(nEntries())/shapes().size() << " cubes"
             << endl;
diff --git a/src/meshTools/octree/octreeLine.C b/src/meshTools/octree/octreeLine.C
index 540721e950..76e56177b6 100644
--- a/src/meshTools/octree/octreeLine.C
+++ b/src/meshTools/octree/octreeLine.C
@@ -120,7 +120,7 @@ bool Foam::octreeLine<Type>::getNextLeaf()
         // Get intersections and sort.
         calcSortedIntersections();
     }
-    while (sortedIntersections_.size() == 0);
+    while (sortedIntersections_.empty());
 
     return true;
 }
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/meshTools/octree/treeBoundBox.C
index c511f74758..ce62c47192 100644
--- a/src/meshTools/octree/treeBoundBox.C
+++ b/src/meshTools/octree/treeBoundBox.C
@@ -117,7 +117,7 @@ Foam::treeBoundBox::treeBoundBox(const UList<point>& points)
 :
     boundBox()
 {
-    if (points.size() == 0)
+    if (points.empty())
     {
         WarningIn
         (
@@ -148,7 +148,7 @@ Foam::treeBoundBox::treeBoundBox
 :
     boundBox()
 {
-    if (points.size() == 0 || meshPoints.size() == 0)
+    if (points.empty() || meshPoints.empty())
     {
         WarningIn
         (
diff --git a/src/meshTools/octree/treeNode.C b/src/meshTools/octree/treeNode.C
index a0ff57fffe..3e503f13a0 100644
--- a/src/meshTools/octree/treeNode.C
+++ b/src/meshTools/octree/treeNode.C
@@ -1381,11 +1381,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const treeNode<Type>& tn)
     {
         if (tn.subNodes_[octant])
         {
-            if
-            (
-                tn.isNode(octant)
-             || (tn.getLeafPtr(octant)->indices().size() != 0)
-            )
+            if (tn.isNode(octant) || tn.getLeafPtr(octant)->indices().size())
             {
                 nPtrs++;
             }
@@ -1409,7 +1405,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const treeNode<Type>& tn)
                 os  << token::SPACE << octant << token::SPACE << *subNodePtr
                     << token::NL;
             }
-            else if (tn.getLeafPtr(octant)->indices().size() != 0)
+            else if (tn.getLeafPtr(octant)->indices().size())
             {
                 // treeLeaf: mark by putting index invalid
                 const treeLeaf<Type>* subLeafPtr = tn.getLeafPtr(octant);
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index ec18bbeeb0..0d4ec63faa 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -720,7 +720,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             }
         }
 
-        if (problemCells.size() > 0)
+        if (problemCells.size())
         {
             // This cycle has failed.  Print out the problem cells
             labelList toc(problemCells.toc());
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index b3152b44b2..667a2ddc5d 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -131,7 +131,7 @@ void Foam::regionSplit::fillSeedMask
 
     // Loop over changed faces. MeshWave in small.
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         //if (debug)
         //{
@@ -265,7 +265,7 @@ Foam::label Foam::regionSplit::calcRegionSplit
 {
     if (debug)
     {
-        if (blockedFace.size() > 0)
+        if (blockedFace.size())
         {
             // Check that blockedFace is synced.
             boolList syncBlockedFace(blockedFace);
@@ -292,7 +292,7 @@ Foam::label Foam::regionSplit::calcRegionSplit
     // -2 blocked
     labelList faceRegion(mesh_.nFaces(), -1);
 
-    if (blockedFace.size() > 0)
+    if (blockedFace.size())
     {
         forAll(blockedFace, faceI)
         {
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index dc5876f7c2..4b14609efa 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -1260,7 +1260,7 @@ void Foam::distributedTriSurfaceMesh::clearOut()
 
 const Foam::globalIndex& Foam::distributedTriSurfaceMesh::globalTris() const
 {
-    if (!globalTris_.valid())
+    if (globalTris_.empty())
     {
         globalTris_.reset(new globalIndex(triSurface::size()));
     }
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index 49e7ed65eb..cb9ca7e442 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -194,7 +194,7 @@ Foam::searchableBox::~searchableBox()
 
 const Foam::wordList& Foam::searchableBox::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index e737c1cfa5..8d61564287 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -244,7 +244,7 @@ Foam::searchablePlate::~searchablePlate()
 
 const Foam::wordList& Foam::searchablePlate::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index 9b2b93ffb4..ba5a1888cf 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -151,7 +151,7 @@ Foam::searchableSphere::~searchableSphere()
 
 const Foam::wordList& Foam::searchableSphere::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 51e0b43259..7b8ef5c685 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -482,7 +482,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
     hitSurfaces.setSize(start.size());
     hitInfo.setSize(start.size());
 
-    if (surfacesToTest.size() == 0)
+    if (surfacesToTest.empty())
     {
         return;
     }
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 633578faca..ad8ffc5927 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -229,7 +229,7 @@ void Foam::triSurfaceMesh::movePoints(const pointField& newPoints)
 const Foam::indexedOctree<Foam::treeDataTriSurface>&
     Foam::triSurfaceMesh::tree() const
 {
-    if (!tree_.valid())
+    if (tree_.empty())
     {
         treeBoundBox bb(points(), meshPoints());
 
@@ -256,7 +256,7 @@ const Foam::indexedOctree<Foam::treeDataTriSurface>&
 const Foam::indexedOctree<Foam::treeDataEdge>&
     Foam::triSurfaceMesh::edgeTree() const
 {
-    if (!edgeTree_.valid())
+    if (edgeTree_.empty())
     {
         treeBoundBox bb(localPoints());
 
@@ -298,7 +298,7 @@ const Foam::indexedOctree<Foam::treeDataEdge>&
 
 const Foam::wordList& Foam::triSurfaceMesh::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(patches().size());
         forAll(regions_, regionI)
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
index 77fa2046f2..a2ef93da4b 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
@@ -62,7 +62,7 @@ void Foam::nearestToPoint::combine(topoSet& set, const bool add) const
     {
         const pointField& pts = mesh_.points();
 
-        if (pts.size() > 0)
+        if (pts.size())
         {
             label minPointI = 0;
             scalar minDistSqr = magSqr(pts[minPointI] - points_[pointI]);
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index daa59aad0d..8d73f64d51 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -181,7 +181,7 @@ Foam::edgeSurface::edgeSurface
         // Store current top of allEdges.
         label freeNewEdgeI = allEdges.size();
 
-        if (extraVerts.size() == 0)
+        if (extraVerts.empty())
         {
             // No cuts across this edge. Note that vertices do not need to be
             // renumbered.
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 21a1227dc5..eadfeb7c4b 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -341,7 +341,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         iter().shrink();
 
         // Check on dangling points.
-        if (iter().size() < 1)
+        if (iter().empty())
         {
             FatalErrorIn
             (
@@ -1171,7 +1171,7 @@ Foam::intersectedSurface::intersectedSurface
     faceMap_(0),
     nSurfacePoints_(surf.nPoints())
 {
-    if ((inter.cutPoints().size() == 0) && (inter.cutEdges().size() == 0))
+    if (inter.cutPoints().empty() && inter.cutEdges().empty())
     {
         // No intersection. Make straight copy.
         triSurface::operator=(surf);
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 42cbef8dab..f3ee58ed0b 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -255,7 +255,7 @@ bool Foam::edgeIntersections::inlinePerturb
 
     const labelList& edgeEnds = classification_[edgeI];
 
-    if (edgeEnds.size() > 0)
+    if (edgeEnds.size())
     {
         bool perturbStart = false;
         bool perturbEnd = false;
@@ -701,7 +701,7 @@ Foam::label Foam::edgeIntersections::removeDegenerates
         // Transfer and test.
         edgesToTest.transfer(newEdgesToTest);
 
-        if (edgesToTest.size() == 0)
+        if (edgesToTest.empty())
         {
             FatalErrorIn("perturb") << "oops" << abort(FatalError);
         }
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index af3d5e7e19..38ee335d33 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -110,7 +110,7 @@ bool Foam::surfaceIntersection::excludeEdgeHit
 //                << "  e0Vec:" << e0Vec << "  n:" << n
 //                << "  normalComponent:" << (n & surf.faceNormals()[faceI])
 //                << "  tol:" << tol << endl;
-//        
+//
 //            return true;
 //        }
 //        else
@@ -399,7 +399,7 @@ void Foam::surfaceIntersection::classifyHit
         {
             // 4. Edge hits edge.
 
-            // Cut edge with new point (creates duplicates when 
+            // Cut edge with new point (creates duplicates when
             // doing the surf2 with surf1 intersection but these
             // are merged later on)
 
@@ -509,7 +509,7 @@ void Foam::surfaceIntersection::classifyHit
                         << " coords:" << surf1.localPoints()[e.start()]
                         << surf1.localPoints()[e.end()] << endl;
                 }
-                
+
                 // Reclassify as normal edge-face pierce (see below)
 
                 allCutPoints.append(hitPt);
@@ -533,7 +533,7 @@ void Foam::surfaceIntersection::classifyHit
                         << " since edge " << e << " on inside of surf2."
                         << " surf2 normal:" << surf2.faceNormals()[surf2FaceI]
                         << endl;
-                }   
+                }
             }
         }
         else
@@ -636,7 +636,7 @@ void Foam::surfaceIntersection::doCutEdges
                     // Label of face on surface2 edgeI intersected
                     label hitFaceI = pHit.index();
 
-                    if 
+                    if
                     (
                         !excludeEdgeHit
                         (
@@ -803,8 +803,8 @@ Foam::surfaceIntersection::surfaceIntersection
 
     // Transfer to straight label(List)List
     transfer(edgeCuts2, surf2EdgeCuts_);
-    transfer(allCutEdges, cutEdges_);
-    transfer(allCutPoints, cutPoints_);
+    cutEdges_.transfer(allCutEdges);
+    cutPoints_.transfer(allCutPoints);
 
 
     if (debug)
@@ -936,8 +936,8 @@ Foam::surfaceIntersection::surfaceIntersection
 
 
     // Transfer to straight label(List)List
-    transfer(allCutEdges, cutEdges_);
-    transfer(allCutPoints, cutPoints_);
+    cutEdges_.transfer(allCutEdges);
+    cutPoints_.transfer(allCutPoints);
 
 
     if (debug)
@@ -1040,11 +1040,11 @@ Foam::surfaceIntersection::surfaceIntersection
 
     // Transfer to straight label(List)List
     transfer(edgeCuts1, surf1EdgeCuts_);
-    transfer(allCutEdges, cutEdges_);
-    transfer(allCutPoints, cutPoints_);
+    cutEdges_.transfer(allCutEdges);
+    cutPoints_.transfer(allCutPoints);
 
-    // Shortcut. 
-    if ((cutPoints_.size() == 0) && (cutEdges_.size() == 0))
+    // Shortcut.
+    if (cutPoints_.empty() && cutEdges_.empty())
     {
         if (debug)
         {
@@ -1071,7 +1071,7 @@ Foam::surfaceIntersection::surfaceIntersection
     // Merge points
     labelList pointMap;
     pointField newPoints;
-    
+
     bool hasMerged = mergePoints
     (
         cutPoints_,
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 62fd58c576..3f23e9e370 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -120,10 +120,6 @@ class surfaceIntersection
             Ostream&
         );
 
-        //- Transfer contents of DynamicList to straight List
-        template<class T>
-        static void transfer(DynamicList<T>&, List<T>&);
-
         //- Transfer contents of List<DynamicList<..> > to List<List<..>>
         template<class T>
         static void transfer(List<DynamicList<T> >&,  List<List<T> >&);
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 258e579fde..711ede3cd2 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -291,7 +291,7 @@ void Foam::surfaceIntersection::writeIntersectedEdges
     {
         const labelList& extraVerts = edgeCutVerts[edgeI];
 
-        if (extraVerts.size() != 0)
+        if (extraVerts.size())
         {
             const edge& e = surf.edges()[edgeI];
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
index d992a2adff..aeec3a8daf 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
@@ -34,27 +34,15 @@ Description
 template<class T>
 void Foam::surfaceIntersection::transfer
 (
-    DynamicList<T>& dList,
-    List<T>& lList
+    List<DynamicList<T> >& srcLst,
+    List<List<T> >& dstLst
 )
 {
-    lList.transfer(dList);
-}
+    dstLst.setSize(srcLst.size());
 
-
-// Transfer contents of DynamicList to List
-template<class T>
-void Foam::surfaceIntersection::transfer
-(
-    List<DynamicList<T> >& dList,
-    List<List<T> >& lList
-)
-{
-    lList.setSize(dList.size());
-
-    forAll(dList, elemI)
+    forAll(srcLst, elemI)
     {
-        transfer(dList[elemI], lList[elemI]);
+        dstLst[elemI].transfer(srcLst[elemI]);
     }
 }
 
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index 4cbbf0461f..911d06747a 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -245,7 +245,7 @@ void Foam::orientedSurface::propagateOrientation
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -259,7 +259,7 @@ void Foam::orientedSurface::propagateOrientation
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedFaces.empty())
         {
             break;
         }
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index aec5c87fb0..c5c0e3d4da 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -84,11 +84,7 @@ void twoDPointCorrector::calcAddressing() const
     {
         forAll (patches, patchI)
         {
-            if
-            (
-                isA<emptyPolyPatch>(patches[patchI])
-             && patches[patchI].size() > 0
-            )
+            if (isA<emptyPolyPatch>(patches[patchI]) && patches[patchI].size())
             {
                 pn = patches[patchI].faceAreas()[0];
 
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 03d8f73912..3ed12ef475 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -220,7 +220,7 @@ void Foam::forces::read(const dictionary& dict)
 void Foam::forces::makeFile()
 {
     // Create the forces file if not already created
-    if (!forcesFilePtr_.valid())
+    if (forcesFilePtr_.empty())
     {
         if (debug)
         {
diff --git a/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C
index ec3a4a5189..c8795d7251 100644
--- a/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C
+++ b/src/postProcessing/functionObjects/minMaxFields/minMaxFields.C
@@ -93,7 +93,7 @@ void Foam::minMaxFields::read(const dictionary& dict)
 void Foam::minMaxFields::makeFile()
 {
     // Create the minMaxFields file if not already created
-    if (!minMaxFieldsFilePtr_.valid())
+    if (minMaxFieldsFilePtr_.empty())
     {
         if (debug)
         {
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index dbd86ca011..b7e31ef906 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -159,7 +159,7 @@ public:
         //- Return true or false to question: have any cells been cut?
         bool cut() const
         {
-            return (cutCells_.size() != 0);
+            return cutCells_.size();
         }
 
         //- Sample the cell field
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 3a0975662c..8233d24ea5 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -160,7 +160,7 @@ void meshToMesh::calcAddressing()
                 fromMeshPatches_.find(patchMap_.find(toPatch.name())())()
             ];
 
-            if (fromPatch.size() == 0)
+            if (fromPatch.empty())
             {
                 WarningIn("meshToMesh::calcAddressing()")
                     << "Source patch " << fromPatch.name()
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index f14bd41fef..0133dee52b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -70,7 +70,7 @@ void meshToMesh::calculateInverseDistanceWeights() const
             if
             (
                 m < directHitTol                            // Direct hit
-             || neighbours.size() == 0
+             || neighbours.empty()
             )
             {
                 invDistCoeffs[celli].setSize(1);
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index a1cca58b0a..f0596ea563 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -41,7 +41,7 @@ namespace Foam
 
 void Foam::probes::findCells(const fvMesh& mesh)
 {
-    if (cellList_.size() == 0)
+    if (cellList_.empty())
     {
         cellList_.setSize(probeLocations_.size());
 
diff --git a/src/sampling/sampledSet/cloud/cloudSet.C b/src/sampling/sampledSet/cloud/cloudSet.C
index b0b1f3f886..bc82887ee4 100644
--- a/src/sampling/sampledSet/cloud/cloudSet.C
+++ b/src/sampling/sampledSet/cloud/cloudSet.C
@@ -156,7 +156,7 @@ Foam::cloudSet::~cloudSet()
 
 Foam::point Foam::cloudSet::getRefPoint(const List<point>& pts) const
 {
-    if (pts.size() > 0)
+    if (pts.size())
     {
         // Use first samplePt as starting point
         return pts[0];
diff --git a/src/sampling/sampledSet/curve/curveSet.C b/src/sampling/sampledSet/curve/curveSet.C
index 1ef624c8d2..7b0a0b8e03 100644
--- a/src/sampling/sampledSet/curve/curveSet.C
+++ b/src/sampling/sampledSet/curve/curveSet.C
@@ -184,17 +184,16 @@ void Foam::curveSet::calcSamples
 
 
             // Get all boundary intersections
-            List<pointIndexHit> bHits =
-                searchEngine().intersections
-                (
-                    sampleCoords_[sampleI],
-                    sampleCoords_[sampleI+1]
-                );
+            List<pointIndexHit> bHits = searchEngine().intersections
+            (
+                sampleCoords_[sampleI],
+                sampleCoords_[sampleI+1]
+            );
 
             point bPoint(GREAT, GREAT, GREAT);
             label bFaceI = -1;
 
-            if (bHits.size() > 0)
+            if (bHits.size())
             {
                 bPoint = bHits[0].hitPoint();
                 bFaceI = bHits[0].index();
@@ -400,7 +399,7 @@ Foam::curveSet::~curveSet()
 
 Foam::point Foam::curveSet::getRefPoint(const List<point>& pts) const
 {
-    if (pts.size() > 0)
+    if (pts.size())
     {
         // Use first samplePt as starting point
         return pts[0];
diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 09c41d36d0..fba774f802 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -121,17 +121,16 @@ void Foam::faceOnlySet::calcSamples
 
 
     // Get all boundary intersections
-    List<pointIndexHit> bHits =
-        searchEngine().intersections
-        (
-            start_ - smallVec,
-            end_ + smallVec
-        );
+    List<pointIndexHit> bHits = searchEngine().intersections
+    (
+        start_ - smallVec,
+        end_ + smallVec
+    );
 
     point bPoint(GREAT, GREAT, GREAT);
     label bFaceI = -1;
 
-    if (bHits.size() > 0)
+    if (bHits.size())
     {
         bPoint = bHits[0].hitPoint();
         bFaceI = bHits[0].index();
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 52374b19c8..f09a82e30a 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -195,7 +195,7 @@ void Foam::sampledSets::combineSampledSets
         // Get reference point (note: only master has all points)
         point refPt;
 
-        if (allPts.size() > 0)
+        if (allPts.size())
         {
             refPt = samplePts.getRefPoint(allPts);
         }
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index 759e774ce9..3ec4fad1bd 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -227,7 +227,7 @@ void Foam::sampledSets::sampleAndWrite
         bool interpolate = interpolationScheme_ != "cell";
 
         // Create or use existing writer
-        if (!fields.formatter.valid())
+        if (fields.formatter.empty())
         {
             fields.formatter = writer<Type>::New(writeFormat_);
         }
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 99bde6fb13..9b25ba4234 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -238,17 +238,16 @@ void Foam::uniformSet::calcSamples
     const scalar smallDist = mag(smallVec);
 
     // Get all boundary intersections
-    List<pointIndexHit> bHits =
-        searchEngine().intersections
-        (
-            start_ - smallVec,
-            end_ + smallVec
-        );
+    List<pointIndexHit> bHits = searchEngine().intersections
+    (
+        start_ - smallVec,
+        end_ + smallVec
+    );
 
     point bPoint(GREAT, GREAT, GREAT);
     label bFaceI = -1;
 
-    if (bHits.size() > 0)
+    if (bHits.size())
     {
         bPoint = bHits[0].hitPoint();
         bFaceI = bHits[0].index();
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index b76534e496..b46546abbf 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -151,7 +151,7 @@ public:
         //- Faces of surface
         virtual const faceList& faces() const
         {
-            if (!facesPtr_.valid())
+            if (facesPtr_.empty())
             {
                 const triSurface& s = surface();
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index 98cc2e12d9..8522dd8442 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -274,9 +274,7 @@ Foam::pointIndexHit Foam::isoSurface::collapseSurface
 {
     pointIndexHit info(false, vector::zero, localTris.size());
 
-    if (localTris.size() == 0)
-    {}
-    else if (localTris.size() == 1)
+    if (localTris.size() == 1)
     {
         const labelledTri& tri = localTris[0];
         info.setPoint(tri.centre(localPoints));
@@ -303,7 +301,7 @@ Foam::pointIndexHit Foam::isoSurface::collapseSurface
             info.setHit();
         }
     }
-    else
+    else if (localTris.size())
     {
         // Check if single region. Rare situation.
         triSurface surf
@@ -1071,7 +1069,7 @@ void Foam::isoSurface::walkOrientation
 
     changedFaces.append(seedTriI);
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         DynamicList<label> newChangedFaces(changedFaces.size());
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index b34e472787..52398eafa4 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -289,9 +289,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
 {
     pointIndexHit info(false, vector::zero, localTris.size());
 
-    if (localTris.size() == 0)
-    {}
-    else if (localTris.size() == 1)
+    if (localTris.size() == 1)
     {
         const labelledTri& tri = localTris[0];
         info.setPoint(tri.centre(localPoints));
@@ -318,7 +316,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
             info.setHit();
         }
     }
-    else
+    else if (localTris.size())
     {
         // Check if single region. Rare situation.
         triSurface surf
@@ -404,11 +402,7 @@ void Foam::isoSurfaceCell::calcSnappedCc
                 }
             }
 
-            if (localPoints.size() == 0)
-            {
-                // No near intersections
-            }
-            else if (localPoints.size() == 1)
+            if (localPoints.size() == 1)
             {
                 // No need for any analysis.
                 snappedCc[cellI] = snappedPoints.size();
@@ -432,7 +426,7 @@ void Foam::isoSurfaceCell::calcSnappedCc
                 //    << " intersections down to "
                 //    << snappedPoints[snappedCc[cellI]] << endl;
             }
-            else
+            else if (localPoints.size())
             {
                 // Need to analyse
                 forAll(cFaces, cFaceI)
@@ -719,11 +713,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             }
         }
 
-        if (localTriPoints.size() == 0)
-        {
-            // No near intersections
-        }
-        else if (localTriPoints.size() == 3)
+        if (localTriPoints.size() == 3)
         {
             // Single triangle. No need for any analysis. Average points.
             pointField points;
@@ -734,7 +724,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             //    << " replacing coord:" << mesh_.points()[pointI]
             //    << " by average:" << collapsedPoint[pointI] << endl;
         }
-        else
+        else if (localTriPoints.size())
         {
             // Convert points into triSurface.
 
@@ -1124,7 +1114,7 @@ void Foam::isoSurfaceCell::walkOrientation
 
     changedFaces.append(seedTriI);
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         DynamicList<label> newChangedFaces(changedFaces.size());
 
@@ -1636,7 +1626,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
 //// ones so limited benefit (e.g. 60 v.s. 88 triangles)
 //void Foam::isoSurfaceCell::combineCellTriangles()
 //{
-//    if (size() > 0)
+//    if (size())
 //    {
 //        DynamicList<labelledTri> newTris(size());
 //        DynamicList<label> newTriToCell(size());
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index c3bfae31de..7ba7d852dc 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -73,7 +73,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if
         (
-           !storedVolFieldPtr_.valid()
+            storedVolFieldPtr_.empty()
          || (fvm.time().timeName() != storedVolFieldPtr_().instance())
         )
         {
@@ -145,7 +145,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if
         (
-           !storedPointFieldPtr_.valid()
+            storedPointFieldPtr_.empty()
          || (fvm.time().timeName() != storedPointFieldPtr_().instance())
         )
         {
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index a403e85e4f..b0c5ff37b2 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -160,7 +160,7 @@ public:
         //- Faces of surface
         virtual const faceList& faces() const
         {
-            if (!facesPtr_.valid())
+            if (facesPtr_.empty())
             {
                 const triSurface& s = surface();
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index a0916cabd3..741958d49e 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -150,7 +150,7 @@ public:
         //- Faces of surface
         virtual const faceList& faces() const
         {
-            if (!facesPtr_.valid())
+            if (facesPtr_.empty())
             {
                 const triSurface& s = *this;
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index c3dc6490a8..3aff356cef 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -29,7 +29,7 @@ License
 template<class Type>
 bool Foam::sampledSurface::checkFieldSize(const Field<Type>& field) const
 {
-    if (faces().size() == 0 || field.size() == 0)
+    if (faces().empty() || field.empty())
     {
         return false;
     }
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 84acff27a2..003515c7d4 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -128,7 +128,7 @@ bool Foam::sampledSurfaces::checkFieldTypes()
     nFields += grep(symmTensorFields_, fieldTypes);
     nFields += grep(tensorFields_, fieldTypes);
 
-    if (Pstream::master)
+    if (Pstream::master())
     {
         if (debug)
         {
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 7b2510a8f8..e93bb0bde7 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -80,7 +80,7 @@ void Foam::sampledSurfaces::sampleAndWrite
 
         if (s.interpolate())
         {
-            if (!interpolator.valid())
+            if (interpolator.empty())
             {
                 interpolator = interpolation<Type>::New
                 (
@@ -170,7 +170,7 @@ void Foam::sampledSurfaces::sampleAndWrite
     if (fields.size())
     {
         // create or use existing surfaceWriter
-        if (!fields.formatter.valid())
+        if (fields.formatter.empty())
         {
             fields.formatter = surfaceWriter<Type>::New(writeFormat_);
         }
diff --git a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
index 1df3b917d1..6135f70378 100644
--- a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
@@ -131,6 +131,29 @@ void Foam::BasicMeshedSurface<Face>::reset
 }
 
 
+template<class Face>
+void Foam::BasicMeshedSurface<Face>::reset
+(
+    const Xfer<List<point> >& pointLst,
+    const Xfer<List<Face> >& faceLst
+)
+{
+    ParentType::clearOut();
+
+    // Take over new primitive data.
+    // Optimized to avoid overwriting data at all
+    if (&pointLst)
+    {
+        storedPoints().transfer(pointLst());
+    }
+
+    if (&faceLst)
+    {
+        storedFaces().transfer(faceLst());
+    }
+}
+
+
 // Remove badly degenerate faces, double faces.
 template<class Face>
 void Foam::BasicMeshedSurface<Face>::cleanup(const bool verbose)
@@ -438,7 +461,7 @@ Foam::label Foam::BasicMeshedSurface<Face>::triangulate
     // remember the number of *additional* faces
     nTri -= faceLst.size();
 
-    if (this->points().size() == 0)
+    if (this->points().empty())
     {
         // triangulate without points
         // simple face triangulation around f[0]
diff --git a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
index b807b72f56..bb31595d0a 100644
--- a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
@@ -138,6 +138,13 @@ public:
             const Xfer<List<Face> >&
         );
 
+        //- Transfer components (points, faces).
+        virtual void reset
+        (
+            const Xfer<List<point> >&,
+            const Xfer<List<Face> >&
+        );
+
         //- Remove invalid faces
         virtual void cleanup(const bool verbose);
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index c260f5765b..7c0dc9cdcd 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -423,13 +423,13 @@ template<class Face>
 void Foam::MeshedSurface<Face>::onePatch(const word& name)
 {
     word patchName(name);
-    if (!patchName.size())
+    if (patchName.empty())
     {
-        if (patches_.size() >= 1)
+        if (patches_.size())
         {
             patchName = patches_[0].name();
         }
-        if (!patchName.size())
+        if (patchName.empty())
         {
             patchName = "patch0";
         }
@@ -537,7 +537,7 @@ void Foam::MeshedSurface<Face>::remapFaces
     // recalculate the patch start/size
     if (&faceMap && faceMap.size())
     {
-        if (patches_.size() == 0)
+        if (patches_.empty())
         {
             onePatch();
         }
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
index c49ea825a0..0d147477c4 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
@@ -62,7 +62,7 @@ bool Foam::MeshedSurface<Face>::read(Istream& is)
         surf.reset
         (
             Xfer<pointField>::null(),
-            xferMove(faceLst)
+            faceLst.xfer()
         );
         surf.addPatches(patches_);
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 7cd2c6d1ba..cb1997c225 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -307,13 +307,13 @@ void Foam::UnsortedMeshedSurface<Face>::onePatch(const word& name)
     regions_ = 0;
 
     word patchName(name);
-    if (!patchName.size())
+    if (patchName.empty())
     {
-        if (patches_.size() >= 1)
+        if (patches_.size())
         {
             patchName = patches_[0].name();
         }
-        if (!patchName.size())
+        if (patchName.empty())
         {
             patchName = "patch0";
         }
@@ -404,7 +404,7 @@ void Foam::UnsortedMeshedSurface<Face>::remapFaces
     // re-assign the region Ids
     if (&faceMap && faceMap.size())
     {
-        if (patches_.size() == 0)
+        if (patches_.empty())
         {
             onePatch();
         }
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index d195443acf..7f4cad25dc 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -169,7 +169,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
 
         // Skip empty or comment
-        if (line.size() == 0 || line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
             continue;
         }
@@ -389,12 +389,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
     }
 
 
-    sortFacesAndStore
-    (
-        xferMoveTo<List<Face> >(dynFaces),
-        xferMoveTo<List<label> >(dynRegions),
-        sorted
-    );
+    sortFacesAndStore(dynFaces.xfer(), dynRegions.xfer(), sorted);
 
     // add patches, culling empty groups
     this->addPatches(dynSizes, names, true);
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index db82ff8ad1..93bee6e737 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -138,7 +138,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
                 string::size_type startNum =
                     line.find_first_not_of(' ', endNum);
 
-                if (startNum == string::size_type(string::npos))
+                if (startNum == string::npos)
                 {
                     break;
                 }
@@ -146,7 +146,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
                 endNum = line.find(' ', startNum);
 
                 string vertexSpec;
-                if (endNum != string::size_type(string::npos))
+                if (endNum != string::npos)
                 {
                     vertexSpec = line.substr(startNum, endNum-startNum);
                 }
@@ -158,7 +158,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
                 string::size_type slashPos = vertexSpec.find('/');
 
                 label vertI = 0;
-                if (slashPos != string::size_type(string::npos))
+                if (slashPos != string::npos)
                 {
                     IStringStream intStream(vertexSpec.substr(0, slashPos));
 
@@ -202,12 +202,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
     // transfer to normal lists
     this->storedPoints().transfer(dynPoints);
 
-    sortFacesAndStore
-    (
-        xferMoveTo<List<Face> >(dynFaces),
-        xferMoveTo<List<label> >(dynRegions),
-        sorted
-    );
+    sortFacesAndStore(dynFaces.xfer(), dynRegions.xfer(), sorted);
 
     // add patches, culling empty groups
     this->addPatches(dynSizes, dynNames, true);
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 17c8dcd981..c679edc963 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -143,11 +143,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
     }
 
     // transfer to normal lists
-    reset
-    (
-        xferMove(pointLst),
-        xferMoveTo<List<Face> >(dynFaces)
-    );
+    reset(pointLst.xfer(), dynFaces.xfer());
 
     // no region information
     this->onePatch();
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 3831dd5938..f6aa76f307 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -212,12 +212,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
     }
     mapPointId.clear();
 
-    sortFacesAndStore
-    (
-        xferMoveTo<List<Face> >(dynFaces),
-        xferMoveTo<List<label> >(dynRegions),
-        sorted
-    );
+    sortFacesAndStore(dynFaces.xfer(), dynRegions.xfer(), sorted);
 
     // add patches, culling empty groups
     this->addPatches(dynSizes, dynNames, true);
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index cc32362da1..d60e49180c 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -293,9 +293,9 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
     this->storedPoints().transfer(reader.points());
 
     // retrieve the original region information
-    List<word>  names(xferMove(reader.names()));
-    List<label> sizes(xferMove(reader.sizes()));
-    List<label> regions(xferMove(reader.regions()));
+    List<word>  names(reader.names().xfer());
+    List<label> sizes(reader.sizes().xfer());
+    List<label> regions(reader.regions().xfer());
 
     // generate the (sorted) faces
     List<Face> faceLst(regions.size());
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
index 6a03268d7d..520c22e0d5 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
@@ -405,12 +405,12 @@ endsolid              {space}("endsolid"|"ENDSOLID")({some_space}{word})*
 bool Foam::fileFormats::STLsurfaceFormatCore::readASCII
 (
     IFstream& ifs,
-    const off_t fileSize
+    const off_t dataFileSize
 )
 {
     // Create the lexer with the approximate number of vertices in the STL
     // from the file size
-    STLASCIILexer lexer(&ifs.stdStream(), fileSize/400);
+    STLASCIILexer lexer(&ifs.stdStream(), dataFileSize/400);
     while (lexer.lex() != 0) {}
 
     sorted_ = lexer.sorted();
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
index edfcabe19d..087f7d0d88 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
@@ -45,7 +45,7 @@ int Foam::fileFormats::STLsurfaceFormatCore::detectBINARY
     const fileName& filename
 )
 {
-    off_t fileSize = Foam::size(filename);
+    off_t dataFileSize = Foam::fileSize(filename);
 
     IFstream ifs(filename, IOstream::BINARY);
     istream& is = ifs.stdStream();
@@ -74,8 +74,8 @@ int Foam::fileFormats::STLsurfaceFormatCore::detectBINARY
     (
         !is
      || nTris < 0
-     || nTris < (fileSize - headerSize)/50
-     || nTris > (fileSize - headerSize)/25
+     || nTris < (dataFileSize - headerSize)/50
+     || nTris > (dataFileSize - headerSize)/25
     )
     {
         return 0;
@@ -89,7 +89,7 @@ int Foam::fileFormats::STLsurfaceFormatCore::detectBINARY
 bool Foam::fileFormats::STLsurfaceFormatCore::readBINARY
 (
     IFstream& ifs,
-    const off_t fileSize
+    const off_t dataFileSize
 )
 {
     sorted_ = true;
@@ -124,8 +124,8 @@ bool Foam::fileFormats::STLsurfaceFormatCore::readBINARY
     (
         !is
      || nTris < 0
-     || nTris < (fileSize - headerSize)/50
-     || nTris > (fileSize - headerSize)/25
+     || nTris < (dataFileSize - headerSize)/50
+     || nTris > (dataFileSize - headerSize)/25
     )
     {
         FatalErrorIn
@@ -224,16 +224,16 @@ Foam::fileFormats::STLsurfaceFormatCore::STLsurfaceFormatCore
     names_(0),
     sizes_(0)
 {
-    off_t fileSize = Foam::size(filename);
+    off_t dataFileSize = Foam::fileSize(filename);
 
     // auto-detect ascii/binary
     if (detectBINARY(filename))
     {
-        readBINARY(IFstream(filename, IOstream::BINARY)(), fileSize);
+        readBINARY(IFstream(filename, IOstream::BINARY)(), dataFileSize);
     }
     else
     {
-        readASCII(IFstream(filename)(), fileSize);
+        readASCII(IFstream(filename)(), dataFileSize);
     }
 }
 
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index 9c5ccd80a1..252773be6b 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -56,7 +56,7 @@ Foam::fileFormats::surfaceFormatsCore::getLineNoComment
     {
         is.getLine(line);
     }
-    while ((line.size() == 0 || line[0] == '#') && is.good());
+    while ((line.empty() || line[0] == '#') && is.good());
 
     return line;
 }
@@ -267,7 +267,7 @@ Foam::fileFormats::surfaceFormatsCore::checkSupport
     else if (verbose)
     {
         wordList toc = available.toc();
-        SortableList<word> known(xferMove(toc));
+        SortableList<word> known(toc.xfer());
 
         Info<<"Unknown file extension for " << functionName
             << " : " << ext << nl
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 9c75628a0d..7aaa1369e4 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -88,8 +88,8 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
     this->storedPoints().transfer(reader.points());
 
     // retrieve the original region information
-    List<label> sizes(xferMove(reader.sizes()));
-    List<label> regions(xferMove(reader.regions()));
+    List<label> sizes(reader.sizes().xfer());
+    List<label> regions(reader.regions().xfer());
 
     // generate the (sorted) faces
     List<Face> faceLst(regions.size());
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
index f403ae4496..d32e172dae 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -863,7 +863,7 @@ bool finishReaction = false;
             {
                 case unimolecularFallOffReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "LOW keyword given for a unimolecular fall-off"
@@ -898,7 +898,7 @@ bool finishReaction = false;
 
                 case chemicallyActivatedBimolecularReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "HIGH keyword given for a chemically"
@@ -935,7 +935,7 @@ bool finishReaction = false;
 
                 case TroeReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "TROE keyword given for a"
@@ -969,7 +969,7 @@ bool finishReaction = false;
 
                 case SRIReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "SRI keyword given for a"
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 1871007784..bef2864e3e 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -49,10 +49,10 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void linearValveFvMesh::addZonesAndModifiers() : "
@@ -235,7 +235,7 @@ bool Foam::linearValveFvMesh::attached() const
         {
             if
             (
-                result 
+                result
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index fc4a96ec9a..9dd4c56c2f 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -51,10 +51,10 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void linearValveLayersFvMesh::addZonesAndModifiers() : "
@@ -287,7 +287,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
         {
             if
             (
-                result 
+                result
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 1fc143ff75..2e42a81c0f 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -49,10 +49,10 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void mixerFvMesh::addZonesAndModifiers() : "
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 42e603e677..2ebc9f7ff0 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -88,10 +88,10 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void movingConeTopoFvMesh::addZonesAndModifiers() : "
@@ -133,7 +133,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
                 << flipZone1[nZoneFaces1] << endl;
             nZoneFaces1++;
         }
-        else if 
+        else if
         (
             fc[faceI].x() > -0.00701
          && fc[faceI].x() < -0.00699
@@ -326,7 +326,7 @@ bool Foam::movingConeTopoFvMesh::update()
 
     vector curMotionVel_ =
         motionVelAmplitude_*
-        Foam::sin(time().value()*M_PI/motionVelPeriod_); 
+        Foam::sin(time().value()*M_PI/motionVelPeriod_);
 
     Pout<< "time:" << time().value() << " curMotionVel_:" << curMotionVel_
         << " curLeft:" << curLeft_ << " curRight:" << curRight_
diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/triSurface/meshTriangulation/meshTriangulation.C
index 134c5d7f7a..49066b804d 100644
--- a/src/triSurface/meshTriangulation/meshTriangulation.C
+++ b/src/triSurface/meshTriangulation/meshTriangulation.C
@@ -364,7 +364,7 @@ Foam::meshTriangulation::meshTriangulation
                 // Triangulate face. Fall back to naive triangulation if failed.
                 faceTriangulation faceTris(points, faces[faceI], true);
 
-                if (faceTris.size() == 0)
+                if (faceTris.empty())
                 {
                     WarningIn("meshTriangulation::meshTriangulation")
                         << "Could not find triangulation for face " << faceI
@@ -427,7 +427,7 @@ Foam::meshTriangulation::meshTriangulation
                 // Triangulate face
                 faceTriangulation faceTris(points, faces[faceI], true);
 
-                if (faceTris.size() == 0)
+                if (faceTris.empty())
                 {
                     WarningIn("meshTriangulation::meshTriangulation")
                         << "Could not find triangulation for face " << faceI
diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
index dd49ad72d1..1154d64c56 100644
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
@@ -60,7 +60,7 @@ geometricSurfacePatch::geometricSurfacePatch
     boundaryIndex_(index)
 
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
@@ -74,7 +74,7 @@ geometricSurfacePatch::geometricSurfacePatch(Istream& is, const label index)
     name_(is),
     boundaryIndex_(index)
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
@@ -93,7 +93,7 @@ geometricSurfacePatch::geometricSurfacePatch
     name_(name),
     boundaryIndex_(index)
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index 726c538294..609c058351 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -62,13 +62,12 @@ static bool readCmd(IFstream& ACfile, string& cmd, string& args)
         string line;
         ACfile.getLine(line);
 
-        label spaceIndex = line.find(' ');
+        string::size_type space = line.find(' ');
 
-        if (spaceIndex != label(string::npos))
+        if (space != string::npos)
         {
-            cmd = line.substr(0, spaceIndex);
-
-            args = line.substr(spaceIndex+1);
+            cmd  = line.substr(0, space);
+            args = line.substr(space+1);
 
             return true;
         }
@@ -91,16 +90,12 @@ static bool readUpto
         string line;
         ACfile.getLine(line);
 
-        label spaceIndex = line.find(' ');
+        string::size_type space = line.find(' ');
 
-        if (spaceIndex != label(string::npos))
+        if (space != string::npos && line.substr(0, space) == cmd)
         {
-            if (line.substr(0, spaceIndex) == cmd)
-            {
-                args = line.substr(spaceIndex+1);
-
-                return true;
-            }
+            args = line.substr(space+1);            
+            return true;
         }
     }
     return false;
@@ -331,13 +326,10 @@ bool triSurface::readAC(const fileName& ACfileName)
         }
     }
 
-    points.shrink();
     faces.shrink();
 
     // Transfer DynamicLists to straight ones.
-    pointField allPoints;
-    allPoints.transfer(points);
-    points.clear();
+    pointField allPoints(points.xfer());
 
     *this = triSurface(faces, patches, allPoints, true);
 
diff --git a/src/triSurface/triSurface/interfaces/NAS/readNAS.C b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
index 393484e87b..c2ebfab341 100644
--- a/src/triSurface/triSurface/interfaces/NAS/readNAS.C
+++ b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
@@ -169,7 +169,7 @@ bool triSurface::readNAS(const fileName& fName)
         }
 
 
-        if (line.size() == 0 || line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
             // Skip empty or comment
             continue;
@@ -353,11 +353,8 @@ bool triSurface::readNAS(const fileName& fName)
 
     Info<< "patches:" << patches << endl;
 
-
     // Transfer DynamicLists to straight ones.
-    pointField allPoints;
-    allPoints.transfer(points);
-    points.clear();
+    pointField allPoints(points.xfer());
 
     // Create triSurface
     *this = triSurface(faces, patches, allPoints, true);
diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
index c48343721a..cfab7e726f 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
@@ -105,13 +105,14 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
             DynamicList<label> verts;
 
             // Assume 'f' is followed by space.
-            size_type endNum = 1;
+            string::size_type endNum = 1;
 
             while(true)
             {
-                size_type startNum = line.find_first_not_of(' ', endNum);
+                string::size_type startNum =
+                    line.find_first_not_of(' ', endNum);
 
-                if (startNum == size_type(string::npos))
+                if (startNum == string::npos)
                 {
                     break;
                 }
@@ -119,7 +120,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
                 endNum = line.find(' ', startNum);
 
                 string vertexSpec;
-                if (endNum != size_type(string::npos))
+                if (endNum != string::npos)
                 {
                     vertexSpec = line.substr(startNum, endNum-startNum);
                 }
@@ -128,10 +129,10 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
                     vertexSpec = line.substr(startNum, line.size() - startNum);
                 }
 
-                size_type slashPos = vertexSpec.find('/');
+                string::size_type slashPos = vertexSpec.find('/');
 
                 label vertI = 0;
-                if (slashPos != size_type(string::npos))
+                if (slashPos != string::npos)
                 {
                     IStringStream intStream(vertexSpec.substr(0, slashPos));
 
@@ -193,8 +194,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
 
 
     // Transfer DynamicLists to straight ones.
-    pointField allPoints;
-    allPoints.transfer(points);
+    pointField allPoints(points.xfer());
 
     // Create triSurface
     *this = triSurface(faces, patches, allPoints, true);
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 2ba62edba3..208aa13d16 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -398,7 +398,7 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
 
     // Create the lexer obtaining the approximate number of vertices in the STL
     // from the file size
-    STLLexer lexer(&STLstream.stdStream(), Foam::size(STLfileName)/400);
+    STLLexer lexer(&STLstream.stdStream(), Foam::fileSize(STLfileName)/400);
     while(lexer.lex() != 0)
     {}
 
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index a377306bbf..4c7c9e859a 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -89,9 +89,9 @@ bool triSurface::readSTLBINARY(const fileName& STLfileName)
     // If the comparison is not sensible then it maybe an ASCII file
     if (!compressed)
     {
-        label triDataSize = Foam::size(STLfileName) - 80;
+        label dataFileSize = Foam::fileSize(STLfileName) - 80;
 
-        if (nTris < triDataSize/50 || nTris > triDataSize/25)
+        if (nTris < dataFileSize/50 || nTris > dataFileSize/25)
         {
             return false;
         }
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index bd78acff15..c0452e46aa 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -67,7 +67,7 @@ bool triSurface::readTRI(const fileName& TRIfileName)
     {
         string line = getLineNoComment(TRIfile);
 
-        if (line.size() == 0)
+        if (line.empty())
         {
             break;
         }
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index ff56e2ce4e..9ec6de95f5 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -178,7 +178,7 @@ Foam::string Foam::triSurface::getLineNoComment(IFstream& is)
     {
         is.getLine(line);
     }
-    while((line.size() == 0 || line[0] == '#') && is.good());
+    while ((line.empty() || line[0] == '#') && is.good());
 
     return line;
 }
@@ -327,7 +327,7 @@ void Foam::triSurface::checkEdges(const bool verbose)
     {
         const labelList& myFaces = eFaces[edgeI];
 
-        if (myFaces.size() == 0)
+        if (myFaces.empty())
         {
             FatalErrorIn("triSurface::checkEdges(bool verbose)")
                 << "Edge " << edgeI << " with vertices " << edges()[edgeI]
@@ -638,7 +638,7 @@ Foam::surfacePatchList Foam::triSurface::calcPatches(labelList& faceMap) const
     // Extend regions
     label maxRegion = patches_.size()-1;    // for non-compacted regions
 
-    if (faceMap.size() > 0)
+    if (faceMap.size())
     {
         maxRegion = max
         (
@@ -1007,7 +1007,7 @@ void Foam::triSurface::markZone
             }
         }
 
-        if (newChangedFaces.size() == 0)
+        if (newChangedFaces.empty())
         {
             break;
         }
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index b58c9557d4..6912872c9b 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -119,12 +119,12 @@ void SpalartAllmarasIDDES::dTildaUpdate(const volScalarField& S)
         2.0*(pos(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0));
 
 
-    volScalarField fStep = min(2.0*pow(expTerm, -9.0), 1.0);
+    volScalarField fStep = min(2.0*pow(expTerm, -9.0), scalar(1));
     volScalarField fHyb = max(1.0 - fd(S), fStep);
 
     volScalarField fAmp = 1.0 - max(ft(S), fl(S));
 
-    volScalarField fRestore = max(fHill - 1.0, 0.0)*fAmp;
+    volScalarField fRestore = max(fHill - 1.0, scalar(0))*fAmp;
 
     // volScalarField ft2 = IGNORING ft2 terms
 
@@ -132,7 +132,7 @@ void SpalartAllmarasIDDES::dTildaUpdate(const volScalarField& S)
     (
         min
         (
-            100.0,
+            scalar(100),
             (1.0 - Cb1_/(Cw1_*sqr(kappa_)*fwStar_)*fv2())/max(SMALL, fv1())
         )
     );
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
index 880209e7f6..f42afb995d 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -139,7 +139,7 @@ void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
 
             do
             {
-                scalar kUu = min(kappa*magUpara/utau, 100);
+                scalar kUu = min(kappa*magUpara/utau, 50);
                 scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
 
                 scalar f =
diff --git a/wmake/rules/General/version b/wmake/rules/General/version
index 64f272ed08..11f83c7b74 100644
--- a/wmake/rules/General/version
+++ b/wmake/rules/General/version
@@ -1,10 +1,12 @@
 .SUFFIXES: .Cver
 
 #
-# update version string in C++ file and in $WM_PROJECT_DIR/.build file
+# update version strings in C++ file and in $WM_PROJECT_DIR/.build file
 #
 Cvertoo = \
-    sed 's/WM_PROJECT_VERSION/$(shell wmakePrintBuild -update)/' $$SOURCE > $*.C; \
+    sed -e 's/VERSION_STRING/$(shell wmakePrintBuild -major)/' \
+        -e 's/BUILD_STRING/$(shell wmakePrintBuild -update)/' \
+        $$SOURCE > $*.C; \
     $(CC) $(c++FLAGS) -c $*.C -o $@
 
 .Cver.dep:
diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ b/wmake/rules/SiCortex64Gcc/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/SiCortex64Gcc/mplibMPI b/wmake/rules/SiCortex64Gcc/mplibMPI
index 4b284e2439..1fb55dd946 100644
--- a/wmake/rules/SiCortex64Gcc/mplibMPI
+++ b/wmake/rules/SiCortex64Gcc/mplibMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = 
+PINC       =
 PLIBS      = -lscmpi
diff --git a/wmake/wcleanLnIncludeAll b/wmake/wcleanLnIncludeAll
index 8e032fa17c..0ca7561c6a 100755
--- a/wmake/wcleanLnIncludeAll
+++ b/wmake/wcleanLnIncludeAll
@@ -40,6 +40,7 @@ then
     echo "Usage: ${0##*/} [dir1] .. [dirN]"
     echo
     echo "    Delete all the lnInclude directories in the tree"
+    echo
     exit 1
 fi
 
diff --git a/wmake/wmake b/wmake/wmake
index 4e00499106..61307c1180 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -55,7 +55,7 @@ USAGE
     exit 1
 }
 
-# provide immediate help
+# provide immediate help, even if none of the environment is set
 if [ "$1" = "-h" -o "$1" = "-help" ]
 then
     usage
@@ -73,7 +73,7 @@ do
     }
 done
 
-# when compiling anything but a standalone exe,
+# when compiling anything but a standalone exe:
 # WM_PROJECT and WM_PROJECT_DIR must be set
 [ "$1" = exe -o \( "$WM_PROJECT" -a "$WM_PROJECT_DIR" \) ] || {
     echo "$Script error:" 1>&2
@@ -176,7 +176,7 @@ fi
 
 #------------------------------------------------------------------------------
 # Check the existance of the Make directory and files file
-# If both exist make the wmake derived files
+# If both exist, make the wmake derived files
 #------------------------------------------------------------------------------
 
 [ -d $MakeDir ] || {
@@ -238,7 +238,7 @@ fi
 #------------------------------------------------------------------------------
 
 cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeOption"
-#echo "cmd=$cmd"
+# echo "cmd=$cmd"
 exec $cmd
 
 #------------------------------------------------------------------------------
diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
new file mode 100755
index 0000000000..da803f288e
--- /dev/null
+++ b/wmake/wmakeLnIncludeAll
@@ -0,0 +1,69 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     wmakeLnIncludeAll
+#
+# Description
+#     Find directories containing a Make/ directory and execute
+#     'wmakeLnInclude -f' for each one
+#
+#------------------------------------------------------------------------------
+# default is pwd
+if [ "$#" -eq 0 ]
+then
+    set -- .
+elif [ "$1" = "-h" -o "$1" = "-help" ]
+then
+    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+    echo
+    echo "    Find directories containing a Make/ directory and"
+    echo "    execute 'wmakeLnInclude -f' for each one"
+    echo
+    exit 1
+fi
+
+
+for checkDir
+do
+    if [ -d $checkDir ]
+    then
+        echo "searching: $checkDir for 'Make' directories"
+    else
+        echo "skipping non-dir: $checkDir"
+        continue
+    fi
+
+    find $checkDir -depth -type d -name Make -print | while read dir
+    do
+        dir=${dir%/Make}    # trim /Make directory from the end
+        if [ -d "$dir" ]
+        then
+            wmakeLnInclude -f $dir
+        fi
+    done
+done
+
+#------------------------------------------------------------------------------
diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild
index 13009261da..d82c9ef92d 100755
--- a/wmake/wmakePrintBuild
+++ b/wmake/wmakePrintBuild
@@ -39,7 +39,8 @@ usage: $Script [OPTION]
 options:
   -check          check the git head commit vs. \$WM_PROJECT_DIR/.build
                   (exit code 0 for no changes)
-  -update         update the \$WM_PROJECT_DIR/.build from the git information
+  -major          report \$WM_PROJECT_VERSION only and exit
+  -update         update \$WM_PROJECT_DIR/.build from the git information
   -version VER    specify an alternative version
 
 Print the version used when building the project, in this order of precedence:
@@ -65,6 +66,10 @@ do
         checkOnly=true
         shift
         ;;
+    -major)
+        echo ${WM_PROJECT_VERSION:-unknown}
+        exit 0
+        ;;
     -u | -update)
         update=true
         shift
diff --git a/wmake/wmkdir b/wmake/wmkdir
index 51e8a134e3..441eedb52d 100755
--- a/wmake/wmkdir
+++ b/wmake/wmkdir
@@ -27,22 +27,22 @@
 #     wmkdir
 #
 # Description
-#     Script that makes a directory is not already constructed.
-#     Usage : wmkdir <directoryName>
+#     Script to make a directory that does not already exist
+#     Usage : wmkdir <dir>
 #
 #------------------------------------------------------------------------------
 
 if [ $# -eq 1 ]
 then
-   # provide help
-   if [ "$1" = "-h" -o "$1" = "-help" ]
-   then
-      echo "usage: ${0##*/} <dir>"
-      echo "       mkdir if directory does not already exist"
-   else
-      [ -d "$1" ] || mkdir -p "$1"
-   fi
+    # provide help
+    if [ "$1" = "-h" -o "$1" = "-help" ]
+    then
+        echo "usage: ${0##*/} <dir>"
+        echo "       mkdir if directory does not already exist"
+        echo
+    else
+        [ -d "$1" ] || mkdir -p "$1"
+    fi
 fi
 
-
 #------------------------------------------------------------------------------