diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 3fd05fabe2..70b6754d2f 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -1025,12 +1025,9 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
                 << "keyword " << keyword << " is undefined in dictionary "
                 << name()
                 << exit(FatalIOError);
-            return entryPtr->dict();
-        }
-        else
-        {
-            return dictionary(*this, dictionary(name() + '/' + keyword));
         }
+
+        return dictionary(*this, dictionary(name() + '/' + keyword));
     }
     else
     {
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
index 7774b7a8c8..8f624601bc 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/spatialTensor/spatialTensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ const char* const Foam::spatialTensor::vsType::componentNames[] =
 {
     "Exx",  "Exy",  "Exz",    "Erxx", "Erxy", "Erxz",
     "Eyx",  "Eyy",  "Eyz",    "Eryx", "Eryy", "Eryz",
-    "Ezx",  "Ezy",  "Ezz",    "Erzx", "Erzy", "Erzz"
+    "Ezx",  "Ezy",  "Ezz",    "Erzx", "Erzy", "Erzz",
 
     "Erxx", "Erxy", "Erxz",   "Exx",  "Exy",  "Exz",
     "Eryx", "Eryy", "Eryz",   "Eyx",  "Eyy",  "Eyz",
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index c3cb70ff97..56ca4e8859 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,10 +55,10 @@ bool Foam::fileFormats::STARCDCore::readHeader
     string line;
 
     is.getLine(line);
-    IStringStream(line)() >> header;
+    (IStringStream(line)()) >> header;
 
     is.getLine(line);
-    IStringStream(line)() >> majorVersion;
+    (IStringStream(line)()) >> majorVersion;
 
     // add other checks ...
     if (header != signature)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C
index 8d3f7ef0fc..630443d44a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,7 +189,7 @@ void Foam::timeVaryingMappedFvPatchField<Type>::checkTable()
             }
             else
             {
-                IFstream(valsFile)() >> vals;
+                (IFstream(valsFile)()) >> vals;
             }
 
             if (vals.size() != mapperPtr_().sourceSize())
@@ -243,7 +243,7 @@ void Foam::timeVaryingMappedFvPatchField<Type>::checkTable()
             }
             else
             {
-                IFstream(valsFile)() >> vals;
+                (IFstream(valsFile)()) >> vals;
             }
 
             if (vals.size() != mapperPtr_().sourceSize())
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 0219eafa92..d1e5f826ec 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -381,7 +381,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
             }
             else
             {
-                IFstream(valsFile)() >> vals;
+                (IFstream(valsFile)()) >> vals;
             }
 
             if (vals.size() != mapperPtr_().sourceSize())
@@ -441,7 +441,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
             }
             else
             {
-                IFstream(valsFile)() >> vals;
+                (IFstream(valsFile)()) >> vals;
             }
 
             if (vals.size() != mapperPtr_().sourceSize())