diff --git a/applications/test/List3/Test-List3.C b/applications/test/List3/Test-List3.C
index 21b8b8407d540d1d58d8bc8d4ede7e938bb665a8..95423354bb90decad3d0652edcb1d9e1c3f66894 100644
--- a/applications/test/List3/Test-List3.C
+++ b/applications/test/List3/Test-List3.C
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
         Info<< nl << "Specify an option! " << nl << endl;
     }
 
-    if (args.optionFound("labelListList"))
+    if (args.found("labelListList"))
     {
         for (label argi=1; argi < args.size(); ++argi)
         {
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 0b3acc607ec41137028984db6ad5a82e9ba9863d..ec0125bd96c4e138e44e13cbb69be84ea5057cd1 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -360,10 +360,9 @@ int main(int argc, char *argv[])
     const fileName surfFileName = args[1];
     const bool checkSelfIntersect = args.found("checkSelfIntersection");
     const bool splitNonManifold = args.found("splitNonManifold");
-    const label outputThreshold =
-        args.lookupOrDefault("outputThreshold", 10);
+    const label outputThreshold = args.lookupOrDefault("outputThreshold", 10);
     word surfaceFormat;
-    const bool writeSets = args.optionReadIfPresent("writeSets", surfaceFormat);
+    const bool writeSets = args.readIfPresent("writeSets", surfaceFormat);
 
     autoPtr<surfaceWriter> surfWriter;
     word edgeFormat;
diff --git a/src/OpenFOAM/include/createMesh.H b/src/OpenFOAM/include/createMesh.H
index f2bb851dc6b9df05f84a14cfbc099e0b3e5cbb93..aab5576405dda4439578f2a9883ecc5f0e4850ed 100644
--- a/src/OpenFOAM/include/createMesh.H
+++ b/src/OpenFOAM/include/createMesh.H
@@ -1,6 +1,6 @@
 Foam::autoPtr<Foam::fvMesh> meshPtr(nullptr);
 
-if (args.optionFound("dry-run") || args.optionFound("dry-run-write"))
+if (args.found("dry-run") || args.found("dry-run-write"))
 {
     Foam::Info
         << "Operating in 'dry-run' mode: case will run for 1 time step.  "
@@ -11,18 +11,19 @@ if (args.optionFound("dry-run") || args.optionFound("dry-run-write"))
     // Create a simplified 1D mesh and attempt to re-create boundary conditions
     meshPtr.reset(new Foam::simplifiedMeshes::columnFvMesh(runTime));
 
-    // Stopping after 1 iteration of the simplified mesh
-    // Note: using saNoWriteNow will only trigger the function object execute
-    // function and not the write function
-    runTime.stopAt(Foam::Time::saNoWriteNow);
+    // Stop after 1 iteration of the simplified mesh
 
-    if (args.optionFound("dry-run-write"))
+    if (args.found("dry-run-write"))
     {
-        // Stopping after 1 iteration of the simplified mesh
-        // Note: using saWriteNow to trigger writing/execution of function
-        // objects
+        // Using saWriteNow triggers function objects execute(), write()
         runTime.stopAt(Foam::Time::saWriteNow);
     }
+    else
+    {
+        // Using saNoWriteNow triggers function objects execute(),
+        // but not write()
+        runTime.stopAt(Foam::Time::saNoWriteNow);
+    }
 
     Foam::functionObject::outputPrefix = "postProcessing-dry-run";
 }
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
index 6ebfb467e311cce37228e16d5d94753ffe0a2e4b..3de74d946b66ebe6dbfdbf0064706742ff86a1f2 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -95,26 +95,27 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New
     const Time& runTime
 )
 {
-    if (args.optionFound("dry-run") || args.optionFound("dry-run-write"))
+    if (args.found("dry-run") || args.found("dry-run-write"))
     {
         Info
             << "Operating in 'dry-run' mode: case will run for 1 time step.  "
-            << "All checks assumed OK on a clean exit" << Foam::endl;
+            << "All checks assumed OK on a clean exit" << endl;
 
         FieldBase::allowConstructFromLargerSize = true;
 
-        // Stopping after 1 iteration of the simplified mesh
-        // Note: using saNoWriteNow will only trigger the function object execute
-        // function and not the write function
-        runTime.stopAt(Foam::Time::saNoWriteNow);
+        // Stop after 1 iteration of the simplified mesh
 
-        if (args.optionFound("dry-run-write"))
+        if (args.found("dry-run-write"))
         {
-            // Stopping after 1 iteration of the simplified mesh
-            // Note: using saWriteNow to trigger writing/execution of function
-            // objects
+            // Using saWriteNow triggers function objects execute(), write()
             runTime.stopAt(Foam::Time::saWriteNow);
         }
+        else
+        {
+            // Using saNoWriteNow triggers function objects execute(),
+            // but not write()
+            runTime.stopAt(Foam::Time::saNoWriteNow);
+        }
 
         functionObject::outputPrefix = "postProcessing-dry-run";