diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index 99f723d987..17f5a246a1 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
@@ -64,14 +64,14 @@ Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
 
     HashTable<int>::const_iterator iter = find(name);
 
-    if (iter == HashTable<int>::end())
+    if (!iter.found())
     {
         FatalIOErrorInFunction(is)
             << name << " is not in enumeration: "
             << sortedToc() << exit(FatalIOError);
     }
 
-    return Enum(iter());
+    return Enum(*iter);
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 9b7f73a4f2..6df273e138 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -183,7 +183,7 @@ Foam::string& Foam::stringOps::inplaceExpand
                 HashTable<string, word, string::hash>::const_iterator fnd =
                     mapping.find(varName);
 
-                if (fnd != HashTable<string, word, string::hash>::end())
+                if (fnd.found())
                 {
                     if (altPos != string::npos && altType == '+')
                     {
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index d43444cb91..ab2b3208ff 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -115,7 +115,7 @@ void Foam::patchProbes::sampleAndWrite
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvPatchField, volMesh>::typeName
             )
@@ -167,7 +167,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
             )
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 3ac7b08379..b5c4693657 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -141,7 +141,7 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvPatchField, volMesh>::typeName
             )
@@ -190,7 +190,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
             )