From 345a2a42f15a1bfe53662d96b80c64c9322adca3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 Jan 2018 15:35:18 +0100
Subject: [PATCH] ENH: simplify method names for reading argList options and
 arguments

- use succincter method names that more closely resemble dictionary
  and HashTable method names. This improves method name consistency
  between classes and also requires less typing effort:

    args.found(optName)        vs.  args.optionFound(optName)
    args.readIfPresent(..)     vs.  args.optionReadIfPresent(..)
    ...
    args.opt<scalar>(optName)  vs.  args.optionRead<scalar>(optName)
    args.read<scalar>(index)   vs.  args.argRead<scalar>(index)

- the older method names forms have been retained for code compatibility,
  but are now deprecated
---
 .../basic/potentialFoam/createFields.H        |   4 +-
 .../overPotentialFoam/createFields.H          |   4 +-
 .../overPotentialFoam/potentialFoam.C         |   4 +-
 .../basic/potentialFoam/potentialFoam.C       |   4 +-
 .../magneticFoam/magneticFoam.C               |   8 +-
 .../solvers/lagrangian/DPMFoam/createFields.H |   2 +-
 .../createFields.H                            |   2 +-
 .../createFields.H                            |   2 +-
 .../test/FixedList2/Test-FixedList2.C         |  14 +-
 .../Test-GAMGAgglomeration.C                  |   4 +-
 .../test/HashTable4/Test-HashTable4.C         |   6 +-
 .../test/IOobjectList/Test-IOobjectList.C     |   4 +-
 .../test/IndirectList/Test-IndirectList.C     |   2 +-
 applications/test/List/Test-List.C            |  16 +-
 applications/test/List2/Test-List2.C          |  12 +-
 .../test/PackedList/Test-PackedList.C         |   6 +-
 applications/test/argList/Test-argList.C      |  62 ++-
 .../Test-checkDecomposePar.C                  |  10 +-
 .../test/decomposePar/Test-decomposePar.C     |  14 +-
 .../dictionaryTokens/Test-dictionaryTokens.C  |   4 +-
 applications/test/etcFiles/Test-etcFiles.C    |   4 +-
 .../Test-externalFileCoupler.C                |   4 +-
 applications/test/fileName/Test-fileName.C    |   8 +-
 .../test/fileNameClean/Test-fileNameClean.C   |   6 +-
 .../findCell-octree/Test-findCell-octree.C    |   2 +-
 .../Test-fvSolutionCombine.C                  |   4 +-
 .../test/labelRanges/Test-labelRanges.C       |   6 +-
 .../momentOfInertia/Test-momentOfInertia.C    |   2 +-
 applications/test/mvBak/Test-mvBak.C          |   2 +-
 .../test/objectRegistry/Test-objectRegistry.C |   4 +-
 .../test/quaternion/Test-quaternion.C         |   8 +-
 applications/test/spline/Test-spline.C        |   6 +-
 .../test/stringSplit/Test-stringSplit.C       |  26 +-
 .../Test-surfaceIntersection.C                |  16 +-
 .../Test-surfaceMeshConvert.C                 |  34 +-
 applications/test/tokenize/Test-tokenize.C    |   6 +-
 .../finiteArea/makeFaMesh/makeFaMesh.C        |   2 +-
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C |   2 +-
 .../advanced/collapseEdges/collapseEdges.C    |   8 +-
 .../combinePatchFaces/combinePatchFaces.C     |   8 +-
 .../mesh/advanced/modifyMesh/modifyMesh.C     |   2 +-
 .../advanced/refineHexMesh/refineHexMesh.C    |   4 +-
 .../refineWallLayer/refineWallLayer.C         |   6 +-
 .../refinementLevel/refinementLevel.C         |   2 +-
 .../mesh/advanced/removeFaces/removeFaces.C   |   2 +-
 .../mesh/advanced/splitCells/splitCells.C     |  10 +-
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |   2 +-
 .../mesh/conversion/ccm/ccmToFoam/ccmToFoam.C |  24 +-
 .../mesh/conversion/ccm/foamToCcm/foamToCcm.C |  18 +-
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   |   2 +-
 .../mesh/conversion/fireToFoam/fireToFoam.C   |   6 +-
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   |   8 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |   8 +-
 .../foamToFireMesh/foamToFireMesh.C           |   6 +-
 .../foamToStarMesh/foamToStarMesh.C           |   6 +-
 .../conversion/foamToSurface/foamToSurface.C  |   4 +-
 .../conversion/gambitToFoam/gambitToFoam.L    |   2 +-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |   4 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |   2 +-
 .../mesh/conversion/kivaToFoam/kivaToFoam.C   |   6 +-
 .../mesh/conversion/mshToFoam/mshToFoam.C     |   2 +-
 .../conversion/plot3dToFoam/plot3dToFoam.C    |   8 +-
 .../mesh/conversion/star4ToFoam/star4ToFoam.C |   6 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |   2 +-
 .../conversion/writeMeshObj/writeMeshObj.C    |  20 +-
 .../mesh/generation/blockMesh/blockMesh.C     |  12 +-
 .../extrude/extrudeMesh/extrudeMesh.C         |   2 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |   9 +-
 .../extrude2DMesh/extrude2DMeshApp.C          |   2 +-
 .../foamyMesh/foamyHexMesh/foamyHexMesh.C     |   6 +-
 .../foamyHexMeshBackgroundMesh.C              |   6 +-
 .../foamyHexMeshSurfaceSimplify_non_octree.C  |   2 +-
 .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C   |   4 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |  19 +-
 .../mesh/manipulation/attachMesh/attachMesh.C |   2 +-
 .../mesh/manipulation/autoPatch/autoPatch.C   |   4 +-
 .../mesh/manipulation/checkMesh/checkMesh.C   |  14 +-
 .../createBaffles/createBaffles.C             |   2 +-
 .../manipulation/createPatch/createPatch.C    |   6 +-
 .../manipulation/deformedGeom/deformedGeom.C  |   2 +-
 .../manipulation/mergeMeshes/mergeMeshes.C    |   8 +-
 .../mergeOrSplitBaffles/mergeOrSplitBaffles.C |   8 +-
 .../mesh/manipulation/mirrorMesh/mirrorMesh.C |   2 +-
 .../moveDynamicMesh/moveDynamicMesh.C         |   2 +-
 .../orientFaceZone/orientFaceZone.C           |   2 +-
 .../polyDualMesh/polyDualMeshApp.C            |  13 +-
 .../mesh/manipulation/refineMesh/refineMesh.C |   6 +-
 .../manipulation/renumberMesh/renumberMesh.C  |   6 +-
 .../mesh/manipulation/rotateMesh/rotateMesh.C |   4 +-
 .../mesh/manipulation/setSet/setSet.C         |   8 +-
 .../manipulation/setsToZones/setsToZones.C    |   2 +-
 .../mesh/manipulation/splitMesh/splitMesh.C   |   2 +-
 .../splitMeshRegions/splitMeshRegions.C       |  26 +-
 .../mesh/manipulation/stitchMesh/stitchMesh.C |  20 +-
 .../mesh/manipulation/subsetMesh/subsetMesh.C |  10 +-
 .../mesh/manipulation/topoSet/topoSet.C       |   2 +-
 .../transformPoints/transformPoints.C         |  28 +-
 .../foamDictionary/foamDictionary.C           |  26 +-
 .../foamFormatConvert/foamFormatConvert.C     |   6 +-
 .../helpTypes/helpBoundary/helpBoundary.C     |  10 +-
 .../helpFunctionObject/helpFunctionObject.C   |   2 +-
 .../helpTypes/helpSolver/helpSolver.C         |   4 +-
 .../foamListTimes/foamListTimes.C             |   4 +-
 .../miscellaneous/patchSummary/patchSummary.C |   2 +-
 .../decomposePar/decomposePar.C               |  24 +-
 .../reconstructPar/reconstructPar.C           |  16 +-
 .../reconstructParMesh/reconstructParMesh.C   |  11 +-
 .../redistributePar/redistributePar.C         |  16 +-
 .../foamToEnsight/foamToEnsight.C             |  28 +-
 .../foamToEnsightParts/foamToEnsightParts.C   |  12 +-
 .../foamToTecplot360/foamToTecplot360.C       |  24 +-
 .../dataConversion/foamToVTK/foamToVTK.C      |  48 +--
 .../lumpedPointForces/lumpedPointForces.C     |   2 +-
 .../lumpedPointMovement/lumpedPointMovement.C |  10 +-
 .../lumpedPointZones/lumpedPointZones.C       |   2 +-
 .../temporalInterpolate/temporalInterpolate.C |  10 +-
 .../postProcessing/postProcess/postProcess.C  |  10 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |   6 +-
 .../applyBoundaryLayer/createFields.H         |   8 +-
 .../changeDictionary/changeDictionary.C       |  12 +-
 .../createExternalCoupledPatchGeometry.C      |   8 +-
 .../createZeroDirectory/createZeroDirectory.C |   2 +-
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   |   6 +-
 .../preProcessing/mapFields/mapFields.C       |  16 +-
 .../preProcessing/mapFields/setTimeIndex.H    |   4 +-
 .../preProcessing/mapFieldsPar/mapFieldsPar.C |  18 +-
 .../preProcessing/mapFieldsPar/setTimeIndex.H |   4 +-
 .../utilities/surface/surfaceAdd/surfaceAdd.C |   6 +-
 .../surfaceBooleanFeatures.C                  |  14 +-
 .../surface/surfaceCheck/surfaceCheck.C       |   8 +-
 .../surface/surfaceClean/surfaceClean.C       |   8 +-
 .../surface/surfaceCoarsen/surfaceCoarsen.C   |   4 +-
 .../surface/surfaceConvert/surfaceConvert.C   |  26 +-
 .../surfaceFeatureConvert.C                   |   2 +-
 .../surface/surfaceFind/surfaceFind.C         |   6 +-
 .../surface/surfaceHookUp/surfaceHookUp.C     |   2 +-
 .../surface/surfaceInertia/surfaceInertia.C   |   6 +-
 .../surface/surfaceInflate/surfaceInflate.C   |  12 +-
 .../surfaceLambdaMuSmooth.C                   |   8 +-
 .../surfaceMeshConvert/surfaceMeshConvert.C   |  16 +-
 .../surfaceMeshExport/surfaceMeshExport.C     |  16 +-
 .../surfaceMeshImport/surfaceMeshImport.C     |  16 +-
 .../surface/surfaceMeshInfo/surfaceMeshInfo.C |   6 +-
 .../surfaceMeshTriangulate.C                  |  10 +-
 .../surface/surfaceOrient/surfaceOrient.C     |   8 +-
 .../surfacePointMerge/surfacePointMerge.C     |   4 +-
 .../surfaceRedistributePar.C                  |   4 +-
 .../surfaceSplitNonManifolds.C                |   2 +-
 .../surface/surfaceToPatch/surfaceToPatch.C   |   4 +-
 .../surfaceTransformPoints.C                  |  24 +-
 .../chemkinToFoam/chemkinToFoam.C             |   2 +-
 src/OpenFOAM/db/Time/Time.C                   |   6 +-
 src/OpenFOAM/db/Time/timeSelector.C           |  22 +-
 .../functionObjectList/functionObjectList.C   |   8 +-
 .../functionObjectList/postProcess.H          |   2 +-
 src/OpenFOAM/global/argList/argList.C         | 160 ++++----
 src/OpenFOAM/global/argList/argList.H         | 385 ++++++++++--------
 src/OpenFOAM/global/argList/argListI.H        | 256 +++++++-----
 src/OpenFOAM/include/checkConstantOption.H    |   2 +-
 src/OpenFOAM/include/checkTimeOption.H        |   6 +-
 src/OpenFOAM/include/createNamedMesh.H        |   5 +-
 src/OpenFOAM/include/createNamedPolyMesh.H    |   5 +-
 src/OpenFOAM/include/listOutput.H             |  20 +-
 .../include/setConstantMeshDictionaryIO.H     |   2 +-
 .../include/setSystemMeshDictionaryIO.H       |   2 +-
 .../include/setSystemRunTimeDictionaryIO.H    |   2 +-
 .../include/createNamedDynamicFvMesh.H        |   6 +-
 .../calcRadiusField/calcRadiusField.C         |   2 +-
 168 files changed, 1161 insertions(+), 1040 deletions(-)

diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index eda7cbc0c2..fb699bddf0 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -28,7 +28,7 @@ surfaceScalarField phi
     fvc::flux(U)
 );
 
-if (args.optionFound("initialiseUBCs"))
+if (args.found("initialiseUBCs"))
 {
     U.correctBoundaryConditions();
     phi = fvc::flux(U);
@@ -41,7 +41,7 @@ if (args.optionFound("initialiseUBCs"))
 word pName("p");
 
 // Update name of the pressure field from the command-line option
-args.optionReadIfPresent("pName", pName);
+args.readIfPresent("pName", pName);
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
index b7daa4fe47..0dae19a0de 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
@@ -28,7 +28,7 @@ surfaceScalarField phi
     fvc::flux(U)
 );
 
-if (args.optionFound("initialiseUBCs"))
+if (args.found("initialiseUBCs"))
 {
     U.correctBoundaryConditions();
     phi = fvc::flux(U);
@@ -41,7 +41,7 @@ if (args.optionFound("initialiseUBCs"))
 word pName("p");
 
 // Update name of the pressure field from the command-line option
-args.optionReadIfPresent("pName", pName);
+args.readIfPresent("pName", pName);
 
 // Infer the pressure BCs from the velocity
 wordList pBCTypes
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C
index 7d340fbc36..d63f664a5c 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C
@@ -193,13 +193,13 @@ int main(int argc, char *argv[])
     phi.write();
 
     // Optionally write Phi
-    if (args.optionFound("writePhi"))
+    if (args.found("writePhi"))
     {
         Phi.write();
     }
 
     // Calculate the pressure field from the Euler equation
-    if (args.optionFound("writep"))
+    if (args.found("writep"))
     {
         Info<< nl << "Calculating approximate pressure field" << endl;
 
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index dfc80be425..b0e2b93538 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -181,13 +181,13 @@ int main(int argc, char *argv[])
     phi.write();
 
     // Optionally write Phi
-    if (args.optionFound("writePhi"))
+    if (args.found("writePhi"))
     {
         Phi.write();
     }
 
     // Calculate the pressure field from the Euler equation
-    if (args.optionFound("writep"))
+    if (args.found("writep"))
     {
         Info<< nl << "Calculating approximate pressure field" << endl;
 
diff --git a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
index 6613d2f206..9430aeb8e7 100644
--- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
+++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
 
     psi.write();
 
-    if (!args.optionFound("noH") || args.optionFound("HdotGradH"))
+    if (!args.found("noH") || args.found("HdotGradH"))
     {
         volVectorField H
         (
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
             fvc::reconstruct(fvc::snGrad(psi)*mesh.magSf())
         );
 
-        if (!args.optionFound("noH"))
+        if (!args.found("noH"))
         {
             Info<< nl
                 << "Creating field H for time "
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
             H.write();
         }
 
-        if (args.optionFound("HdotGradH"))
+        if (args.found("HdotGradH"))
         {
             Info<< nl
                 << "Creating field HdotGradH for time "
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (!args.optionFound("noB"))
+    if (!args.found("noB"))
     {
         Info<< nl
             << "Creating field B for time "
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 49f280e428..218388f5c5 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -123,7 +123,7 @@ volScalarField alphac
 );
 
 word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloud", kinematicCloudName);
+args.readIfPresent("cloud", kinematicCloudName);
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
 basicKinematicTypeCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 76c70fffd9..fe2134e3c8 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -58,7 +58,7 @@ volScalarField mu
 );
 
 word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloud", kinematicCloudName);
+args.readIfPresent("cloud", kinematicCloudName);
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
 basicKinematicCollidingCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index 9aa648ce5f..e8dd95b2e8 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 const word kinematicCloudName
 (
-    args.optionLookupOrDefault<word>("cloud", "kinematicCloud")
+    args.lookupOrDefault<word>("cloud", "kinematicCloud")
 );
 
 Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/test/FixedList2/Test-FixedList2.C b/applications/test/FixedList2/Test-FixedList2.C
index efd3cfabdc..5cca80e7a3 100644
--- a/applications/test/FixedList2/Test-FixedList2.C
+++ b/applications/test/FixedList2/Test-FixedList2.C
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
         Info<< nl << "Specify an option! " << nl << endl;
     }
 
-    if (args.optionFound("label"))
+    if (args.found("label"))
     {
         FixedList<label, 100000> list1(1);
         FixedList<label, 100000> list2(0);
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
         runSwapTest(1000001, list1, list2);
     }
 
-    if (args.optionFound("float"))
+    if (args.found("float"))
     {
         FixedList<double, 100000> list1(1.0);
         FixedList<double, 100000> list2(0.0);
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
         runSwapTest(1000001, list1, list2);
     }
 
-    if (args.optionFound("vector"))
+    if (args.found("vector"))
     {
         FixedList<vector, 100000> list1(vector::one);
         FixedList<vector, 100000> list2(vector::zero);
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
         runSwapTest(100001, list1, list2);
     }
 
-    if (args.optionFound("labelList"))
+    if (args.found("labelList"))
     {
         typedef labelList testType;
         testType initVal(500);
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
         runSwapTest(100001, list1, list2);
     }
 
-    if (args.optionFound("vectorList"))
+    if (args.found("vectorList"))
     {
         typedef vectorList testType;
         testType initVal(500);
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
         runSwapTest(100001, list1, list2);
     }
 
-    if (args.optionFound("fixedLabel"))
+    if (args.found("fixedLabel"))
     {
         typedef FixedList<label,1000> testType;
 
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
         runSwapTest(100001, list1, list2);
     }
 
-    if (args.optionFound("fixedLabelList"))
+    if (args.found("fixedLabelList"))
     {
         typedef labelList testType;
         typedef FixedList<testType,10> containerType;
diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
index 611c8163bc..434dd05986 100644
--- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
+++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
@@ -53,8 +53,8 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    bool writeObj = args.optionFound("writeObj");
-    bool normalise = args.optionFound("normalise");
+    bool writeObj = args.found("writeObj");
+    bool normalise = args.found("normalise");
 
     #include "createMesh.H"
 
diff --git a/applications/test/HashTable4/Test-HashTable4.C b/applications/test/HashTable4/Test-HashTable4.C
index b9333f320d..343d89e07e 100644
--- a/applications/test/HashTable4/Test-HashTable4.C
+++ b/applications/test/HashTable4/Test-HashTable4.C
@@ -151,9 +151,9 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
-    const bool optStd = args.optionFound("std");
-    const bool optSet = args.optionFound("set");
-    const bool optFnd = args.optionFound("find");
+    const bool optStd = args.found("std");
+    const bool optSet = args.found("set");
+    const bool optFnd = args.found("find");
 
 
     cpuTime timer;
diff --git a/applications/test/IOobjectList/Test-IOobjectList.C b/applications/test/IOobjectList/Test-IOobjectList.C
index 27bd495950..21ab2fafaf 100644
--- a/applications/test/IOobjectList/Test-IOobjectList.C
+++ b/applications/test/IOobjectList/Test-IOobjectList.C
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     wordReList matcher;
-    if (args.optionFound("re"))
+    if (args.found("re"))
     {
-        matcher = args.optionReadList<wordRe>("re");
+        matcher = args.readList<wordRe>("re");
         Info<<"limit names: " << matcher << nl;
 
     }
diff --git a/applications/test/IndirectList/Test-IndirectList.C b/applications/test/IndirectList/Test-IndirectList.C
index 449af8ca7d..17120cc098 100644
--- a/applications/test/IndirectList/Test-IndirectList.C
+++ b/applications/test/IndirectList/Test-IndirectList.C
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
     printInfo(idl3);
 
     fileName binaryOutput;
-    if (args.optionReadIfPresent("binary", binaryOutput))
+    if (args.readIfPresent("binary", binaryOutput))
     {
         Info<<"Writing output to " << binaryOutput << endl;
 
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index cfb709bf3b..ec4ec9e5a1 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -331,29 +331,29 @@ int main(int argc, char *argv[])
 
     scalar xxx(-1);
 
-    if (args.optionFound("flag"))
+    if (args.found("flag"))
     {
         Info<<"-flag:" << args["flag"] << endl;
     }
 
-    if (args.optionReadIfPresent<scalar>("float", xxx))
+    if (args.readIfPresent<scalar>("float", xxx))
     {
         Info<<"read float " << xxx << endl;
     }
 
-    if (args.optionFound("reList"))
+    if (args.found("reList"))
     {
-        reLst = args.optionReadList<wordRe>("reList");
+        reLst = args.readList<wordRe>("reList");
     }
 
-    if (args.optionFound("wordList"))
+    if (args.found("wordList"))
     {
-        wLst = args.optionReadList<word>("wordList");
+        wLst = args.readList<word>("wordList");
     }
 
-    if (args.optionFound("stringList"))
+    if (args.found("stringList"))
     {
-        sLst = args.optionReadList<string>("stringList");
+        sLst = args.readList<string>("stringList");
     }
 
     Info<< nl
diff --git a/applications/test/List2/Test-List2.C b/applications/test/List2/Test-List2.C
index 0be3acda63..e6183bd553 100644
--- a/applications/test/List2/Test-List2.C
+++ b/applications/test/List2/Test-List2.C
@@ -212,28 +212,28 @@ int main(int argc, char *argv[])
     std::initializer_list<label> increments
         = {10000, 20000, 40000, 80000, 160000};
 
-    if (args.optionFound("label"))
+    if (args.found("label"))
     {
         List<label> list(10, 1);
 
         runResizeTest(100000, list, increments);
     }
 
-    if (args.optionFound("float"))
+    if (args.found("float"))
     {
         List<double> list(10, 1.0);
 
         runResizeTest(10000, list, increments);
     }
 
-    if (args.optionFound("vector"))
+    if (args.found("vector"))
     {
         List<vector> list(10, vector::one);
 
         runResizeTest(10000, list, increments);
     }
 
-    if (args.optionFound("labelList"))
+    if (args.found("labelList"))
     {
         typedef labelList testType;
         testType initVal(500, label(1));
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
         runResizeTest(200, list, increments);
     }
 
-    if (args.optionFound("vectorList"))
+    if (args.found("vectorList"))
     {
         typedef vectorList testType;
         testType initVal(500, vector::one);
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
         runResizeTest(100, list, increments);
     }
 
-    if (args.optionFound("order"))
+    if (args.found("order"))
     {
         List<label> list(100000000, 1);
 
diff --git a/applications/test/PackedList/Test-PackedList.C b/applications/test/PackedList/Test-PackedList.C
index a10bb2858d..61672ec1b8 100644
--- a/applications/test/PackedList/Test-PackedList.C
+++ b/applications/test/PackedList/Test-PackedList.C
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv, false, true);
 
 
-    if (args.optionFound("mask"))
+    if (args.found("mask"))
     {
         Info<< "bit width: " << unsigned(sizeof(unsigned)*CHAR_BIT) << endl;
         reportInfo<1>();
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 
         Info<< "size: " << packLst.size() << nl;
 
-        if (args.optionFound("count"))
+        if (args.found("count"))
         {
             unsigned int rawCount = 0;
             forAll(rawLst, elemI)
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
                 << "packed count: " << packLst.count() << nl;
         }
 
-        if (args.optionFound("info"))
+        if (args.found("info"))
         {
             packLst.printInfo(Info);
         }
diff --git a/applications/test/argList/Test-argList.C b/applications/test/argList/Test-argList.C
index b3394845f5..3556fa7592 100644
--- a/applications/test/argList/Test-argList.C
+++ b/applications/test/argList/Test-argList.C
@@ -27,6 +27,7 @@ Description
 
 #include "argList.H"
 #include "IOstreams.H"
+#include "Switch.H"
 #include "StringStream.H"
 
 using namespace Foam;
@@ -40,9 +41,9 @@ int main(int argc, char *argv[])
     argList::noParallel();
     // argList::noFunctionObjects();
     argList::removeOption("case");
-
-    argList::addOption("label", "value", "Test parsing of label");
+    argList::addOption("label",  "value", "Test parsing of label");
     argList::addOption("scalar", "value", "Test parsing of scalar");
+    argList::addOption("string", "value", "Test string lookup");
 
     // These are actually lies (never had -parseLabel, -parseScalar etc),
     // but good for testing...
@@ -56,10 +57,15 @@ int main(int argc, char *argv[])
     // Fake a future option...
     argList::addOptionCompat("label", {"parse-label", 2112});
 
-    argList args(argc, argv);
+    argList::addArgument("label");
+    argList::addArgument("...");
+    argList::addArgument("label");
+    argList::nonMandatoryArgs();
+
+    argList args(argc, argv, false, true);
 
     Info<<"have: "
-        <<args.optionCount({"label", "scalar"}) << " options" << nl;
+        <<args.count({"label", "scalar"}) << " options" << nl;
 
     label ival;
     scalar sval;
@@ -67,23 +73,59 @@ int main(int argc, char *argv[])
     Info<< nl;
 
     Info<< "-label = " << flush;
-    if (args.optionReadIfPresent("label", ival))
+    if (args.readIfPresent("label", ival))
     {
-        Info<< ival << endl;
+        Info<< ival << nl;
     }
     else
     {
-        Info<< "not specified" << endl;
+        Info<< "not specified" << nl;
     }
 
     Info<< "-scalar = " << flush;
-    if (args.optionReadIfPresent("scalar", sval))
+    if (args.readIfPresent("scalar", sval))
     {
-        Info<< sval << endl;
+        Info<< sval << nl;
     }
     else
     {
-        Info<< "not specified" << endl;
+        Info<< "not specified" << nl;
+    }
+
+
+    // Using direct reading
+    Info<< nl;
+    if (args.found("label"))
+    {
+        Info<< "-label = " << args.opt<label>("label")
+            << " or " << args.optionRead<label>("label")  // old-compat
+            << " or " << readLabel(args["label"])         // with function
+            << nl;
+    }
+
+    if (args.found("scalar"))
+    {
+        Info<< "-scalar = " << args.opt<scalar>("scalar")
+            << " or " << args.optionRead<scalar>("scalar") // old-compat
+            << " or " << readScalar(args["scalar"])        // with function
+            << nl;
+    }
+
+    if (args.found("string"))
+    {
+        Info<< "-string = " << args.opt("string")
+            << " or " << args.optionRead<scalar>("string")  // old-compat
+            << nl;
+    }
+
+
+    // Arg reading
+    Info<< nl;
+    for (label argi=1; argi < args.size(); ++argi)
+    {
+        Info<< "arg[" << argi << "] = " << args.read<string>(argi)
+            << " or " << args.argRead<label>(argi)  // old-compat
+            << nl;
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/applications/test/checkDecomposePar/Test-checkDecomposePar.C b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
index 339ec10963..49eed5ed13 100644
--- a/applications/test/checkDecomposePar/Test-checkDecomposePar.C
+++ b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
@@ -74,9 +74,9 @@ int main(int argc, char *argv[])
 
     const fileName decompFile = args[1];
 
-    const bool region     = args.optionFound("region");
-    const bool allRegions = args.optionFound("allRegions");
-    const bool verbose    = args.optionFound("verbose");
+    const bool region     = args.found("region");
+    const bool allRegions = args.found("allRegions");
+    const bool verbose    = args.found("verbose");
 
     // Set time from database
     #include "createTime.H"
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
     // Allow override of decomposeParDict location
     fileName decompDictFile;
-    args.optionReadIfPresent("decomposeParDict", decompDictFile);
+    args.readIfPresent("decomposeParDict", decompDictFile);
 
     wordList regionNames;
     wordList regionDirs;
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     else
     {
         word regionName;
-        if (args.optionReadIfPresent("region", regionName))
+        if (args.readIfPresent("region", regionName))
         {
             regionNames = wordList(1, regionName);
             regionDirs = regionNames;
diff --git a/applications/test/decomposePar/Test-decomposePar.C b/applications/test/decomposePar/Test-decomposePar.C
index 2cd04dac04..8026319c17 100644
--- a/applications/test/decomposePar/Test-decomposePar.C
+++ b/applications/test/decomposePar/Test-decomposePar.C
@@ -105,15 +105,15 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const bool region     = args.optionFound("region");
-    const bool allRegions = args.optionFound("allRegions");
-    const bool verbose    = args.optionFound("verbose");
+    const bool region     = args.found("region");
+    const bool allRegions = args.found("allRegions");
+    const bool verbose    = args.found("verbose");
 
     const label numSubdomains =
-        args.optionLookupOrDefault<label>("domains", 0);
+        args.lookupOrDefault<label>("domains", 0);
 
     const word methodName =
-        args.optionLookupOrDefault<word>("method", word::null);
+        args.lookupOrDefault<word>("method", word::null);
 
 
     // Set time from database
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
     // Allow override of decomposeParDict location
     fileName decompDictFile;
-    args.optionReadIfPresent("decomposeParDict", decompDictFile);
+    args.readIfPresent("decomposeParDict", decompDictFile);
 
     wordList regionNames;
     wordList regionDirs;
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
     else
     {
         word regionName;
-        if (args.optionReadIfPresent("region", regionName))
+        if (args.readIfPresent("region", regionName))
         {
             regionNames = wordList(1, regionName);
             regionDirs = regionNames;
diff --git a/applications/test/dictionaryTokens/Test-dictionaryTokens.C b/applications/test/dictionaryTokens/Test-dictionaryTokens.C
index 05c7b3bb01..ba27d7710f 100644
--- a/applications/test/dictionaryTokens/Test-dictionaryTokens.C
+++ b/applications/test/dictionaryTokens/Test-dictionaryTokens.C
@@ -54,8 +54,8 @@ int main(int argc, char *argv[])
     argList::addArgument("dict .. dictN");
     argList args(argc, argv, false, true);
 
-    const bool optInfo  = args.optionFound("info");
-    const bool optValue = args.optionFound("value");
+    const bool optInfo  = args.found("info");
+    const bool optValue = args.found("value");
 
     for (label argi=1; argi < args.size(); ++argi)
     {
diff --git a/applications/test/etcFiles/Test-etcFiles.C b/applications/test/etcFiles/Test-etcFiles.C
index 40a1858198..d4d76aea58 100644
--- a/applications/test/etcFiles/Test-etcFiles.C
+++ b/applications/test/etcFiles/Test-etcFiles.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     // First handle no parameters
     if (args.size() == 1)
     {
-        if (args.optionFound("list"))
+        if (args.found("list"))
         {
             fileNameList results = findEtcDirs();
             printList(results);
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    const bool listAll = (args.optionFound("all") || args.optionFound("list"));
+    const bool listAll = (args.found("all") || args.found("list"));
 
     int error = 0;
 
diff --git a/applications/test/externalFileCoupler/Test-externalFileCoupler.C b/applications/test/externalFileCoupler/Test-externalFileCoupler.C
index 3d04076956..bd1cad0160 100644
--- a/applications/test/externalFileCoupler/Test-externalFileCoupler.C
+++ b/applications/test/externalFileCoupler/Test-externalFileCoupler.C
@@ -45,11 +45,11 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const label maxCount = args.optionLookupOrDefault<label>("max", 1000);
+    const label maxCount = args.lookupOrDefault<label>("max", 1000);
 
     externalFileCoupler coupler;
 
-    if (args.optionFound("slave"))
+    if (args.found("slave"))
     {
         const word role = "slave";
         Info<< "Running as " << role << " max=" << maxCount << endl;
diff --git a/applications/test/fileName/Test-fileName.C b/applications/test/fileName/Test-fileName.C
index 9ccd801245..a60b36e3aa 100644
--- a/applications/test/fileName/Test-fileName.C
+++ b/applications/test/fileName/Test-fileName.C
@@ -177,9 +177,9 @@ int main(int argc, char *argv[])
 
     // Run default tests, unless only specific tests are requested
     const bool defaultTests =
-        args.optionFound("default") || args.options().empty();
+        args.found("default") || args.options().empty();
 
-    if (args.optionFound("construct"))
+    if (args.found("construct"))
     {
         Info<< "From initializer_list<word> = ";
         fileName file1
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
 
 
     // Test various ext() methods
-    if (args.optionFound("ext"))
+    if (args.found("ext"))
     {
         Info<<nl << nl << "handling of fileName extension" << nl;
 
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
     }
 
 
-    if (args.optionFound("validate"))
+    if (args.found("validate"))
     {
         unsigned nFail = 0;
         Info<< nl << "Test fileName::validate" << nl;
diff --git a/applications/test/fileNameClean/Test-fileNameClean.C b/applications/test/fileNameClean/Test-fileNameClean.C
index a64fe73d93..47e3572894 100644
--- a/applications/test/fileNameClean/Test-fileNameClean.C
+++ b/applications/test/fileNameClean/Test-fileNameClean.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     }
 
     fileName pathName;
-    if (args.optionReadIfPresent("case", pathName))
+    if (args.readIfPresent("case", pathName))
     {
         Info<< nl
             << "-case" << nl
@@ -95,10 +95,8 @@ int main(int argc, char *argv[])
         printCleaning(pathName);
     }
 
-    if (args.optionFound("istream"))
+    if (args.readIfPresent("istream", pathName))
     {
-        args.optionLookup("istream")() >> pathName;
-
         Info<< nl
             << "-case" << nl
             << "path = " << args.path() << nl
diff --git a/applications/test/findCell-octree/Test-findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C
index 5295726464..de15a98aac 100644
--- a/applications/test/findCell-octree/Test-findCell-octree.C
+++ b/applications/test/findCell-octree/Test-findCell-octree.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
     label nReps = 10000;
 
-    const point sample = args.argRead<point>(1);
+    const point sample = args.read<point>(1);
 
     const polyMesh::cellDecomposition decompMode = polyMesh::CELL_TETS;
 
diff --git a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
index 2ee7fa1df8..c844c8286b 100644
--- a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
+++ b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
@@ -106,8 +106,8 @@ int main(int argc, char *argv[])
 
     const word dictName("fvSolution");
 
-    bool optRewrite = args.optionFound("rewrite");
-    bool optShow = args.optionFound("show");
+    bool optRewrite = args.found("rewrite");
+    bool optShow = args.found("show");
 
     IOdictionary solutionDict
     (
diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index 3bfdfdf5a3..2535f4cb63 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv, false, true);
 
-    if (args.optionFound("verbose"))
+    if (args.found("verbose"))
     {
         labelRange::debug = 1;
     }
@@ -101,8 +101,8 @@ int main(int argc, char *argv[])
         }
 
         {
-            label start = args.argRead<label>(argI);
-            label size  = args.argRead<label>(argI+1);
+            label start = args.read<label>(argI);
+            label size  = args.read<label>(argI+1);
             ++argI;
 
             range.reset(start, size);
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index 3961caaffc..c20bd481b5 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
     }
 
     {
-        const label celli = args.optionLookupOrDefault("cell", 0);
+        const label celli = args.lookupOrDefault("cell", 0);
 
         tensorField mI(momentOfInertia::meshInertia(mesh));
 
diff --git a/applications/test/mvBak/Test-mvBak.C b/applications/test/mvBak/Test-mvBak.C
index 473944fa0f..2c1d4fab01 100644
--- a/applications/test/mvBak/Test-mvBak.C
+++ b/applications/test/mvBak/Test-mvBak.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     {
         const string& srcFile = args[argI];
 
-        if (args.optionFound("ext"))
+        if (args.found("ext"))
         {
             if (mvBak(srcFile, args["ext"]))
             {
diff --git a/applications/test/objectRegistry/Test-objectRegistry.C b/applications/test/objectRegistry/Test-objectRegistry.C
index 173c1225c2..73e9f193d3 100644
--- a/applications/test/objectRegistry/Test-objectRegistry.C
+++ b/applications/test/objectRegistry/Test-objectRegistry.C
@@ -166,8 +166,8 @@ int main(int argc, char *argv[])
 
     recursive = Switch(args[1]);
 
-    const bool optMesh   = args.optionFound("mesh");
-    const bool optSkip   = args.optionFound("skip");
+    const bool optMesh   = args.found("mesh");
+    const bool optSkip   = args.found("skip");
     const objectRegistry& db = (optMesh ? mesh.thisDb() : runTime);
 
     Info<<"## start ##" << nl;
diff --git a/applications/test/quaternion/Test-quaternion.C b/applications/test/quaternion/Test-quaternion.C
index e1638c7f87..4524d22da8 100644
--- a/applications/test/quaternion/Test-quaternion.C
+++ b/applications/test/quaternion/Test-quaternion.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
     vector rotVector;
 
-    if (args.optionReadIfPresent("rollPitchYaw", rotVector))
+    if (args.readIfPresent("rollPitchYaw", rotVector))
     {
         Info<< "Rotate by" << nl
             << "    roll  " << rotVector.x() << nl
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
         Info<< "quaternion " << quat << endl;
         Info<< "rotation   = " << quat.R() << endl;
     }
-    if (args.optionReadIfPresent("yawPitchRoll", rotVector))
+    if (args.readIfPresent("yawPitchRoll", rotVector))
     {
         Info<< "Rotate by" << nl
             << "    yaw   " << rotVector.x() << nl
@@ -96,11 +96,11 @@ int main(int argc, char *argv[])
         Info<< "quaternion " << quat << endl;
         Info<< "rotation   = " << quat.R() << endl;
     }
-    if (args.optionFound("rotate-angle"))
+    if (args.found("rotate-angle"))
     {
         const Tuple2<vector, scalar> axisAngle
         (
-            args.optionLookup("rotate-angle")()
+            args.lookup("rotate-angle")()
         );
 
         Info<< "Rotate" << nl
diff --git a/applications/test/spline/Test-spline.C b/applications/test/spline/Test-spline.C
index af8addcca7..d3ed9c666a 100644
--- a/applications/test/spline/Test-spline.C
+++ b/applications/test/spline/Test-spline.C
@@ -63,9 +63,9 @@ int main(int argc, char *argv[])
         args.printUsage();
     }
 
-    bool useBSpline = args.optionFound("B");
-    bool useCatmullRom = args.optionFound("CMR");
-    label nSeg = args.optionLookupOrDefault<label>("n", 20);
+    bool useBSpline = args.found("B");
+    bool useCatmullRom = args.found("CMR");
+    label nSeg = args.lookupOrDefault<label>("n", 20);
 
     if (!useCatmullRom && !useBSpline)
     {
diff --git a/applications/test/stringSplit/Test-stringSplit.C b/applications/test/stringSplit/Test-stringSplit.C
index fa91d81f5e..6f3836b185 100644
--- a/applications/test/stringSplit/Test-stringSplit.C
+++ b/applications/test/stringSplit/Test-stringSplit.C
@@ -105,18 +105,12 @@ int main(int argc, char *argv[])
         args.printUsage();
     }
 
-    const bool keepEmpty = args.optionFound("empty");
+    const bool keepEmpty = args.found("empty");
 
-    int nopts = 0;
-    for (auto optName : { "any", "slash", "space", "sub", "fixed", "char" })
-    {
-        if (args.optionFound(optName))
-        {
-            ++nopts;
-        }
-    }
+    const label nopts =
+        args.count({"any", "slash", "space", "sub", "fixed", "char"});
 
-    if (args.optionFound("any"))
+    if (args.found("any"))
     {
         const std::string& str = args["any"];
         Info<< "split on any chars" << nl
@@ -135,7 +129,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("sub"))
+    if (args.found("sub"))
     {
         const std::string& str = args["sub"];
         Info<< "split on substring" << nl
@@ -154,7 +148,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("space"))
+    if (args.found("space"))
     {
         Info<< "split on space" << nl
             << "~~~~~~~~~~~~~~" << nl;
@@ -171,7 +165,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("char"))
+    if (args.found("char"))
     {
         const char delim = args["char"][0];
 
@@ -190,9 +184,9 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("fixed"))
+    if (args.found("fixed"))
     {
-        const label width = readLabel(args["fixed"]);
+        const label width = args.opt<label>("fixed");
 
         Info<< "split on fixed width = " << width << nl
             << "~~~~~~~~~~~~~~" << nl;
@@ -210,7 +204,7 @@ int main(int argc, char *argv[])
     }
 
     // Default
-    if (!nopts || args.optionFound("slash"))
+    if (!nopts || args.found("slash"))
     {
         const char delim = '/';
 
diff --git a/applications/test/surfaceIntersection/Test-surfaceIntersection.C b/applications/test/surfaceIntersection/Test-surfaceIntersection.C
index 7e8ce9a48e..08c8996882 100644
--- a/applications/test/surfaceIntersection/Test-surfaceIntersection.C
+++ b/applications/test/surfaceIntersection/Test-surfaceIntersection.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const scalar scaleFactor = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
 
     const word outputFile(args.executable() + ".obj");
 
@@ -145,18 +145,18 @@ int main(int argc, char *argv[])
     Info<< endl;
 
 
-    if (args.optionFound("debug2"))
+    if (args.found("debug2"))
     {
         surfaceIntersection::debug |= 2;
     }
-    if (args.optionFound("debug4"))
+    if (args.found("debug4"))
     {
         surfaceIntersection::debug |= 4;
     }
-    const bool optPrint = args.optionFound("print");
+    const bool optPrint = args.found("print");
 
     dictionary intersectOptions;
-    if (args.optionFound("dict"))
+    if (args.found("dict"))
     {
         intersectOptions = IOdictionary
         (
@@ -190,12 +190,12 @@ int main(int argc, char *argv[])
     }
 
     word mergeOp;
-    if (args.optionFound("mergePoints"))
+    if (args.found("mergePoints"))
     {
-        cuts.mergePoints(args.optionRead<scalar>("mergePoints"));
+        cuts.mergePoints(args.opt<scalar>("mergePoints"));
         mergeOp = "mergePoints";
     }
-    else if (args.optionFound("mergeEdges"))
+    else if (args.found("mergeEdges"))
     {
         cuts.mergeEdges();
         mergeOp = "mergeEdges";
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index 9db6763955..d65d6956f5 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -142,8 +142,8 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const bool     optStdout = args.optionFound("stdout");
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 0.0);
+    const bool     optStdout = args.found("stdout");
+    const scalar scaleFactor = args.lookupOrDefault("scale", 0.0);
 
     const fileName importName = args[1];
     const fileName exportName = optStdout ? "-stdout" : args[2];
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 
     if
     (
-        !args.optionFound("triSurface")
+        !args.found("triSurface")
     &&
          (
             !MeshedSurface<face>::canRead(importName, true)
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    if (args.optionFound("triSurface"))
+    if (args.found("triSurface"))
     {
         triSurface surf(importName);
 
@@ -198,14 +198,14 @@ int main(int argc, char *argv[])
             // surf2.read(is); // FAIL: private method
         }
 
-        if (args.optionFound("orient"))
+        if (args.found("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.optionFound("clean"))
+        if (args.found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -234,10 +234,10 @@ int main(int argc, char *argv[])
         else
         {
             // normally write sorted (looks nicer)
-            surf.write(exportName, !args.optionFound("unsorted"));
+            surf.write(exportName, !args.found("unsorted"));
         }
     }
-    else if (args.optionFound("unsorted"))
+    else if (args.found("unsorted"))
     {
         UnsortedMeshedSurface<face> surf(importName);
 
@@ -263,14 +263,14 @@ int main(int argc, char *argv[])
             // surf2.read(is);  // FAIL: private method
         }
 
-        if (args.optionFound("orient"))
+        if (args.found("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.optionFound("clean"))
+        if (args.found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
             surf.write(exportName);
         }
     }
-    else if (args.optionFound("triFace"))
+    else if (args.found("triFace"))
     {
         MeshedSurface<triFace> surf(importName);
 
@@ -327,14 +327,14 @@ int main(int argc, char *argv[])
             // surf2.read(is);  // FAIL: private method
         }
 
-        if (args.optionFound("orient"))
+        if (args.found("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.optionFound("clean"))
+        if (args.found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -391,14 +391,14 @@ int main(int argc, char *argv[])
             // surf2.read(is);  // FAIL: private method
         }
 
-        if (args.optionFound("orient"))
+        if (args.found("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.optionFound("clean"))
+        if (args.found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -406,7 +406,7 @@ int main(int argc, char *argv[])
             Info<< endl;
         }
 
-        if (args.optionFound("testModify"))
+        if (args.found("testModify"))
         {
             Info<< "Use ModifiableMeshedSurface to shift (1, 0, 0)" << endl;
             Info<< "original" << nl;
@@ -457,7 +457,7 @@ int main(int argc, char *argv[])
             surf.write(exportName);
         }
 
-        if (args.optionFound("surfMesh"))
+        if (args.found("surfMesh"))
         {
             Foam::Time runTime
             (
diff --git a/applications/test/tokenize/Test-tokenize.C b/applications/test/tokenize/Test-tokenize.C
index f1b27fe200..1f298eaa7d 100644
--- a/applications/test/tokenize/Test-tokenize.C
+++ b/applications/test/tokenize/Test-tokenize.C
@@ -51,9 +51,9 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv, false, true);
 
-    const label repeat = args.optionLookupOrDefault<label>("repeat", 1);
+    const label repeat = args.lookupOrDefault<label>("repeat", 1);
 
-    const bool optVerbose = args.optionFound("verbose");
+    const bool optVerbose = args.found("verbose");
 
     cpuTime timer;
     for (label count = 0; count < repeat; ++count)
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
         << timer.cpuTimeIncrement() << " s\n\n";
 
     fileName inputFile;
-    if (args.optionReadIfPresent("file", inputFile))
+    if (args.readIfPresent("file", inputFile))
     {
         IFstream is(inputFile);
 
diff --git a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
index fab99d7f2a..0cafaf63b5 100644
--- a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
+++ b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
     }
 
     word emptyPatchName;
-    if (args.optionReadIfPresent("addEmptyPatch", emptyPatchName))
+    if (args.readIfPresent("addEmptyPatch", emptyPatchName))
     {
         dictionary emptyPatchDict;
         emptyPatchDict.add("type", "empty");
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 768f3c9f99..f6bac7844a 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -691,7 +691,7 @@ int main(int argc, char *argv[])
     Info<< "Reading blocked cells from cellSet " << blockedSetName
         << endl;
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
 
     // Read faceSets, lookup patches
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index b675b15b3c..fa307d05e6 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -102,10 +102,10 @@ int main(int argc, char *argv[])
 
     IOdictionary collapseDict(dictIO);
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
-    const bool collapseFaces = args.optionFound("collapseFaces");
-    const bool collapseFaceSet = args.optionFound("collapseFaceSet");
+    const bool collapseFaces = args.found("collapseFaces");
+    const bool collapseFaceSet = args.found("collapseFaceSet");
 
     if (collapseFaces && collapseFaceSet)
     {
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
     word faceSetName("indirectPatchFaces");
     IOobject::readOption readFlag = IOobject::READ_IF_PRESENT;
 
-    if (args.optionReadIfPresent("collapseFaceSet", faceSetName))
+    if (args.readIfPresent("collapseFaceSet", faceSetName))
     {
         readFlag = IOobject::MUST_READ;
     }
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 979d3ac6f9..f1e3218540 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -368,16 +368,16 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.argRead<scalar>(1);
+    const scalar featureAngle = args.read<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
 
     // Sin of angle between two consecutive edges on a face.
     // If sin(angle) larger than this the face will be considered concave.
-    scalar concaveAngle = args.optionLookupOrDefault("concaveAngle", 30.0);
+    scalar concaveAngle = args.lookupOrDefault("concaveAngle", 30.0);
     scalar concaveSin = Foam::sin(degToRad(concaveAngle));
 
-    const bool overwrite = args.optionFound("overwrite");
-    const bool meshQuality = args.optionFound("meshQuality");
+    const bool overwrite = args.found("overwrite");
+    const bool meshQuality = args.found("meshQuality");
 
     Info<< "Merging all faces of a cell" << nl
         << "    - which are on the same patch" << nl
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 4ac6cf6017..3574e0cd0a 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -345,7 +345,7 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     Info<< "Reading modifyMeshDict\n" << endl;
 
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 7679e54544..5b123d64e2 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -73,9 +73,9 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     word cellSetName(args[1]);
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
-    const bool minSet = args.optionFound("minSet");
+    const bool minSet = args.found("minSet");
 
     Info<< "Reading cells to refine from cellSet " << cellSetName
         << nl << endl;
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 752bd5efc9..7e3940ee00 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -84,8 +84,8 @@ int main(int argc, char *argv[])
     const wordReList patches((IStringStream(args[1])()));
     const labelHashSet patchSet(mesh.boundaryMesh().patchSet(patches));
 
-    const scalar weight  = args.argRead<scalar>(2);
-    const bool overwrite = args.optionFound("overwrite");
+    const scalar weight  = args.read<scalar>(2);
+    const bool overwrite = args.found("overwrite");
 
     if (!patchSet.size())
     {
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
 
     // Edit list of cells to refine according to specified set
     word setName;
-    if (args.optionReadIfPresent("useSet", setName))
+    if (args.readIfPresent("useSet", setName))
     {
         Info<< "Subsetting cells to cut based on cellSet"
             << setName << nl << endl;
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 53f9a6313a..aeb86ce0f8 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
         << " to allow for some truncation error."
         << nl << endl;
 
-    const bool readLevel = args.optionFound("readLevel");
+    const bool readLevel = args.found("readLevel");
 
     const scalarField& vols = mesh.cellVolumes();
 
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 826106f664..2578a37e9b 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     const word setName = args[1];
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     // Read faces
     faceSet candidateSet(mesh, setName);
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index fdeee85b12..96028a969e 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -553,15 +553,15 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar featureAngle = args.argRead<scalar>(1);
+    const scalar featureAngle = args.read<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
     const scalar minSin = Foam::sin(degToRad(featureAngle));
 
-    const bool readSet   = args.optionFound("set");
-    const bool geometry  = args.optionFound("geometry");
-    const bool overwrite = args.optionFound("overwrite");
+    const bool readSet   = args.found("set");
+    const bool geometry  = args.found("geometry");
+    const bool overwrite = args.found("overwrite");
 
-    const scalar edgeTol = args.optionLookupOrDefault("tol", 0.2);
+    const scalar edgeTol = args.lookupOrDefault("tol", 0.2);
 
     Info<< "Trying to split cells with internal angles > feature angle\n" << nl
         << "featureAngle      : " << featureAngle << nl
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 48ae6c1555..9915c946d6 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -311,7 +311,7 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
index 203dafb7e5..8596ca8f9c 100644
--- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
+++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
@@ -160,11 +160,11 @@ int main(int argc, char *argv[])
     Time runTime(args.rootPath(), args.caseName());
     runTime.functionObjects().off();
 
-    const bool optList = args.optionFound("list");
+    const bool optList = args.found("list");
 
     // exportName only has a size when export is in effect
     fileName exportName;
-    if (args.optionReadIfPresent("name", exportName))
+    if (args.readIfPresent("name", exportName))
     {
         const word ext = exportName.ext();
         // strip erroneous extension (.ccm, .ccmg, .ccmp)
@@ -173,22 +173,22 @@ int main(int argc, char *argv[])
             exportName = exportName.lessExt();
         }
     }
-    else if (args.optionFound("export"))
+    else if (args.found("export"))
     {
         exportName = ccm::writer::defaultMeshName;
-        if (args.optionFound("case"))
+        if (args.found("case"))
         {
             exportName += '-' + args.globalCaseName();
         }
     }
 
     // By default, no scaling
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
     // Default to binary output, unless otherwise specified
     const IOstream::streamFormat format =
     (
-        args.optionFound("ascii")
+        args.found("ascii")
       ? IOstream::ASCII
       : IOstream::BINARY
     );
@@ -201,15 +201,15 @@ int main(int argc, char *argv[])
     // ~~~~~~~~~~~~~~~~~~~~
 
     ccm::reader::options rOpts;
-    rOpts.removeBaffles(args.optionFound("noBaffles"));
-    rOpts.mergeInterfaces(args.optionFound("merge"));
+    rOpts.removeBaffles(args.found("noBaffles"));
+    rOpts.mergeInterfaces(args.found("merge"));
 
-    if (args.optionFound("numbered"))
+    if (args.found("numbered"))
     {
         rOpts.useNumberedNames(true);
     }
 
-    if (args.optionFound("solids"))
+    if (args.found("solids"))
     {
         Info<< "treating solids like fluids" << endl;
         rOpts.keepSolid(true);
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
 
             if
             (
-                args.optionFound("remap")
+                args.found("remap")
               ? reader.remapMeshInfo(runTime, args["remap"])
               : reader.remapMeshInfo(runTime)
             )
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
     {
         autoPtr<polyMesh> mesh =
         (
-            args.optionFound("remap")
+            args.found("remap")
           ? reader.mesh(runTime, args["remap"])
           : reader.mesh(runTime)
         );
diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
index 31ef8b3a8d..f2b2fff920 100644
--- a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
+++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
@@ -123,12 +123,12 @@ int main(int argc, char *argv[])
     // get times list
     instantList timeDirs = Foam::timeSelector::select0(runTime, args);
 
-    const bool optMesh      = args.optionFound("mesh");
-    const bool optResults   = args.optionFound("results");
-    const bool optOverwrite = args.optionFound("overwrite");
+    const bool optMesh      = args.found("mesh");
+    const bool optResults   = args.found("results");
+    const bool optOverwrite = args.found("overwrite");
 
     fileName exportName = ccm::writer::defaultMeshName;
-    if (args.optionReadIfPresent("name", exportName))
+    if (args.readIfPresent("name", exportName))
     {
         const word ext = exportName.ext();
         // strip erroneous extension (.ccm, .ccmg, .ccmp)
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
             exportName = exportName.lessExt();
         }
     }
-    else if (args.optionFound("case"))
+    else if (args.found("case"))
     {
         exportName += '-' + args.globalCaseName();
     }
@@ -154,9 +154,9 @@ int main(int argc, char *argv[])
 //     // skip over time=0, unless some other time option has been specified
 //     if
 //     (
-//         !args.optionFound("zeroTime")
-//      && !args.optionFound("time")
-//      && !args.optionFound("latestTime")
+//         !args.found("zeroTime")
+//      && !args.found("time")
+//      && !args.found("latestTime")
 //      && Times.size() > 2
 //     )
 //     {
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
             );
             // writer.setTopologyFile(exportName + ".ccmg");
             Info<< "writing solution:";
-            if (args.optionFound("remap"))
+            if (args.found("remap"))
             {
                 writer.writeSolution(objects, args["remap"]);
             }
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 4e4db90b26..30390ec15d 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
index 0893aafab3..c7c6277d4b 100644
--- a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
+++ b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
     // Binary output, unless otherwise specified
     const IOstream::streamFormat format =
     (
-        args.optionFound("ascii")
+        args.found("ascii")
       ? IOstream::ASCII
       : IOstream::BINARY
     );
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     (
         args[1],
         // Default no scaling
-        args.optionLookupOrDefault("scale", 1.0)
+        args.lookupOrDefault("scale", 1.0)
     );
 
 
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
     reader.writeMesh(mesh(), format);
 
 
-    if (args.optionFound("check"))
+    if (args.found("check"))
     {
         checkFireEdges(mesh());
     }
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index f96c1c95ef..111aba3252 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -804,15 +804,15 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    args.optionReadIfPresent("scale", scaleFactor);
+    args.readIfPresent("scale", scaleFactor);
 
     wordHashSet ignoreCellGroups;
     wordHashSet ignoreFaceGroups;
 
-    args.optionReadIfPresent("ignoreCellGroups", ignoreCellGroups);
-    args.optionReadIfPresent("ignoreFaceGroups", ignoreFaceGroups);
+    args.readIfPresent("ignoreCellGroups", ignoreCellGroups);
+    args.readIfPresent("ignoreFaceGroups", ignoreFaceGroups);
 
-    cubitFile = args.optionFound("cubit");
+    cubitFile = args.found("cubit");
 
     if (cubitFile)
     {
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 9505fae630..0449dd3b81 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -898,10 +898,10 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
-    const bool writeSets  = args.optionFound("writeSets");
-    const bool writeZones = args.optionFound("writeZones");
+    const bool writeSets  = args.found("writeSets");
+    const bool writeZones = args.found("writeZones");
 
     #include "createTime.H"
 
@@ -975,7 +975,7 @@ int main(int argc, char *argv[])
 
         scalar twoDThickness = 1.0;
 
-        if (!args.optionReadIfPresent("2D", twoDThickness))
+        if (!args.readIfPresent("2D", twoDThickness))
         {
             const scalar extrusionFactor = 0.02; //0.01 in each direction
             boundBox box(points);
diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C b/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C
index 216f253d5f..00f53e3570 100644
--- a/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C
+++ b/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
 
     fileName exportName = meshWriter::defaultMeshName;
-    if (args.optionFound("case"))
+    if (args.found("case"))
     {
         exportName += '-' + args.globalCaseName();
     }
@@ -89,11 +89,11 @@ int main(int argc, char *argv[])
 
     // write control options
     // ~~~~~~~~~~~~~~~~~~~~~
-    fileFormats::FIREMeshWriter::binary = !args.optionFound("ascii");
+    fileFormats::FIREMeshWriter::binary = !args.found("ascii");
 
     // Default: no rescaling
     scalar scaleFactor = 1;
-    if (args.optionReadIfPresent("scale", scaleFactor))
+    if (args.readIfPresent("scale", scaleFactor))
     {
         if (scaleFactor <= 0)
         {
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index 496473676f..642462c124 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -90,14 +90,14 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
 
     fileName exportName = meshWriter::defaultMeshName;
-    if (args.optionFound("case"))
+    if (args.found("case"))
     {
         exportName += '-' + args.globalCaseName();
     }
 
     // Default rescale from [m] to [mm]
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1000.0);
-    const bool  writeBndFile = !args.optionFound("noBnd");
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1000.0);
+    const bool  writeBndFile = !args.found("noBnd");
 
     #include "createPolyMesh.H"
 
diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
index 978866f542..cebbcda5fd 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
+++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
@@ -77,8 +77,8 @@ int main(int argc, char *argv[])
     fileName exportName = args[1];
 
     scalar scaleFactor = 0;
-    args.optionReadIfPresent<scalar>("scale", scaleFactor);
-    const bool doTriangulate = args.optionFound("tri");
+    args.readIfPresent<scalar>("scale", scaleFactor);
+    const bool doTriangulate = args.found("tri");
 
     fileName exportBase = exportName.lessExt();
     word exportExt = exportName.ext();
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index fcc853807c..0925ada004 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -640,7 +640,7 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
     #include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 70c595b52c..92fc68a556 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -783,7 +783,7 @@ int main(int argc, char *argv[])
 
     Foam::word regionName;
 
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         Foam::Info
             << "Creating polyMesh for region " << regionName << endl;
@@ -793,7 +793,7 @@ int main(int argc, char *argv[])
         regionName = Foam::polyMesh::defaultRegion;
     }
 
-    const bool keepOrientation = args.optionFound("keepOrientation");
+    const bool keepOrientation = args.found("keepOrientation");
     IFstream inFile(args[1]);
 
     // Storage for points
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 7afb5d4b71..ca7172a715 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -1122,7 +1122,7 @@ int main(int argc, char *argv[])
 
 
     // For debugging: dump boundary faces as OBJ surface mesh
-    if (args.optionFound("dump"))
+    if (args.found("dump"))
     {
         Info<< "Writing boundary faces to OBJ file boundaryFaces.obj"
             << nl << endl;
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 97ab3bd509..2a25cac6f5 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -82,10 +82,10 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const fileName kivaFileName =
-        args.optionLookupOrDefault<fileName>("file", "otape17");
+        args.lookupOrDefault<fileName>("file", "otape17");
 
     kivaVersions kivaVersion = kiva3v;
-    if (args.optionFound("version"))
+    if (args.found("version"))
     {
         const word versionName = args["version"];
 
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     }
 
     scalar zHeadMin = -GREAT;
-    args.optionReadIfPresent("zHeadMin", zHeadMin);
+    args.readIfPresent("zHeadMin", zHeadMin);
 
     #include "readKivaGrid.H"
 
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index 3b03488169..7f813bc0d3 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const bool readHex = args.optionFound("hex");
+    const bool readHex = args.found("hex");
     IFstream mshStream(args[1]);
 
     label nCells;
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index a453bf88c3..92bc69fcb3 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -90,12 +90,12 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
+    const scalar scaleFactor = args.lookupOrDefault("scale", 1.0);
 
-    const bool readBlank = !args.optionFound("noBlank");
-    const bool singleBlock = args.optionFound("singleBlock");
+    const bool readBlank = !args.found("noBlank");
+    const bool singleBlock = args.found("singleBlock");
     scalar twoDThickness = -1;
-    if (args.optionReadIfPresent("2D", twoDThickness))
+    if (args.readIfPresent("2D", twoDThickness))
     {
         Info<< "Reading 2D case by extruding points by " << twoDThickness
             << " in z direction." << nl << endl;
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index 8b9ae05658..c3ffaf04f0 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
     // Binary output, unless otherwise specified
     const IOstream::streamFormat format =
     (
-        args.optionFound("ascii")
+        args.found("ascii")
       ? IOstream::ASCII
       : IOstream::BINARY
     );
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
         prefix,
         runTime,
         // Default rescale from [mm] to [m]
-        args.optionLookupOrDefault("scale", 0.001),
-        args.optionFound("solids")
+        args.lookupOrDefault("scale", 0.001),
+        args.found("solids")
     );
 
 
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 52443ba755..6d9295dd93 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     const fileName prefix = args[1];
-    const bool readFaceFile = !args.optionFound("noFaceFile");
+    const bool readFaceFile = !args.found("noFaceFile");
 
     const fileName nodeFile(prefix + ".node");
     const fileName eleFile(prefix + ".ele");
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index bbdc484108..9e7f4f424c 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -429,13 +429,13 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    const bool patchFaces = args.optionFound("patchFaces");
-    const bool patchEdges = args.optionFound("patchEdges");
-    const bool doCell     = args.optionFound("cell");
-    const bool doPoint    = args.optionFound("point");
-    const bool doFace     = args.optionFound("face");
-    const bool doCellSet  = args.optionFound("cellSet");
-    const bool doFaceSet  = args.optionFound("faceSet");
+    const bool patchFaces = args.found("patchFaces");
+    const bool patchEdges = args.found("patchEdges");
+    const bool doCell     = args.found("cell");
+    const bool doPoint    = args.found("point");
+    const bool doFace     = args.found("face");
+    const bool doCellSet  = args.found("cellSet");
+    const bool doFaceSet  = args.found("faceSet");
 
 
     Info<< "Writing mesh objects as .obj files such that the object"
@@ -467,19 +467,19 @@ int main(int argc, char *argv[])
             }
             if (doCell)
             {
-                label celli = args.optionRead<label>("cell");
+                const label celli = args.opt<label>("cell");
 
                 writePoints(mesh, celli, runTime.timeName());
             }
             if (doPoint)
             {
-                label pointi = args.optionRead<label>("point");
+                const label pointi = args.opt<label>("point");
 
                 writePointCells(mesh, pointi, runTime.timeName());
             }
             if (doFace)
             {
-                label facei = args.optionRead<label>("face");
+                const label facei = args.opt<label>("face");
 
                 fileName fName
                 (
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index dcc06edb8f..c7c23f5933 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
     word regionPath;
 
     // Check if the region is specified otherwise mesh the default region
-    if (args.optionReadIfPresent("region", regionName, polyMesh::defaultRegion))
+    if (args.readIfPresent("region", regionName, polyMesh::defaultRegion))
     {
         Info<< nl << "Generating mesh for region " << regionName << endl;
         regionPath = regionName;
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
     fileName dictPath;
 
     // Check if the dictionary is specified on the command-line
-    if (args.optionReadIfPresent("dict", dictPath))
+    if (args.readIfPresent("dict", dictPath))
     {
         if (isDir(dictPath))
         {
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
         dictPath = runTime.system()/regionPath/dictName;
     }
 
-    if (!args.optionFound("noClean"))
+    if (!args.found("noClean"))
     {
         fileName polyMeshPath
         (
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
     IOdictionary meshDict(meshDictIO);
     blockMesh blocks(meshDict, regionName);
 
-    if (args.optionFound("blockTopology"))
+    if (args.found("blockTopology"))
     {
         // Write mesh as edges.
         {
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Writing polyMesh with "
         << mesh.cellZones().size() << " cellZones";
-    if (args.optionFound("sets") && !mesh.cellZones().empty())
+    if (args.found("sets") && !mesh.cellZones().empty())
     {
         Info<< " (written as cellSets too)";
     }
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    if (args.optionFound("sets"))
+    if (args.found("sets"))
     {
         forAll(mesh.cellZones(), zonei)
         {
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 194e185ac5..9051a84db5 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
     // Get optional regionName
     word regionName;
     word regionDir;
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         regionDir = regionName;
         Info<< "Create mesh " << regionName << " for time = "
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 3ac79b9be5..db1b8c2480 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1473,8 +1473,6 @@ void extrudeGeometricProperties
 }
 
 
-
-
 int main(int argc, char *argv[])
 {
     argList::addNote("Create region mesh by extruding a faceZone or faceSet");
@@ -1501,8 +1499,7 @@ int main(int argc, char *argv[])
 
 
     const word oldInstance = mesh.pointsInstance();
-    bool overwrite = args.optionFound("overwrite");
-
+    const bool overwrite = args.found("overwrite");
 
     const word dictName("extrudeToRegionMeshDict");
 
@@ -1510,11 +1507,9 @@ int main(int argc, char *argv[])
 
     IOdictionary dict(dictIO);
 
-
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(dict));
 
-
     // Region
     const word shellRegionName(dict.lookup("region"));
 
@@ -1522,7 +1517,7 @@ int main(int argc, char *argv[])
     wordList zoneNames;
     wordList zoneShadowNames;
 
-    bool hasZones = dict.found("faceZones");
+    const bool hasZones = dict.found("faceZones");
     if (hasZones)
     {
         dict.lookup("faceZones") >> zoneNames;
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 701f63c0ce..d6d87e4c8f 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
     runTimeExtruded.functionObjects().off();
 
     const ExtrudeMode surfaceFormat = ExtrudeModeNames[args[1]];
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     Info<< "Extruding from " << ExtrudeModeNames[surfaceFormat]
         << " at time " << runTimeExtruded.timeName() << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 88c9c82e01..3c20f17a84 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -62,12 +62,12 @@ int main(int argc, char *argv[])
 
     runTime.functionObjects().off();
 
-    const bool checkGeometry = args.optionFound("checkGeometry");
-    const bool conformationOnly = args.optionFound("conformationOnly");
+    const bool checkGeometry = args.found("checkGeometry");
+    const bool conformationOnly = args.found("conformationOnly");
 
     // Allow override of decomposeParDict location
     fileName decompDictFile;
-    args.optionReadIfPresent("decomposeParDict", decompDictFile);
+    args.readIfPresent("decomposeParDict", decompDictFile);
 
     IOdictionary foamyHexMeshDict
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index cedc0c2357..4f34c66bdb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -62,7 +62,7 @@ scalar getMergeDistance
 )
 {
     scalar mergeTol = defaultMergeTol;
-    args.optionReadIfPresent("mergeTol", mergeTol);
+    args.readIfPresent("mergeTol", mergeTol);
 
     scalar writeTol =
         Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision()));
@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    const bool writeMesh = args.optionFound("writeMesh");
+    const bool writeMesh = args.found("writeMesh");
 
     if (writeMesh)
     {
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
 
         // Allow override of decomposeParDict location
         fileName decompDictFile;
-        args.optionReadIfPresent("decomposeParDict", decompDictFile);
+        args.readIfPresent("decomposeParDict", decompDictFile);
 
         labelList decomp = decompositionModel::New
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
index 4bf1b3b453..c59168946e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    const labelVector n(args.argRead<labelVector>(1));
+    const labelVector n(args.read<labelVector>(1));
     const fileName exportName = args[2];
 
     Info<< "Reading surfaces as specified in the foamyHexMeshDict and"
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index a9f173aa43..39e905bd31 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -82,13 +82,13 @@ int main(int argc, char *argv[])
     const dictionary& extrusionDict(controlDict.subDict("extrusion"));
 
     Switch extrude(extrusionDict.lookup("extrude"));
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     // Read and triangulation
     // ~~~~~~~~~~~~~~~~~~~~~~
     CV2D mesh(runTime, controlDict);
 
-    if (args.optionFound("pointsFile"))
+    if (args.found("pointsFile"))
     {
         mesh.insertPoints(args["pointsFile"]);
     }
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 52121de686..d3d4942766 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -711,22 +711,21 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    const bool overwrite = args.optionFound("overwrite");
-    const bool checkGeometry = args.optionFound("checkGeometry");
-    const bool surfaceSimplify = args.optionFound("surfaceSimplify");
+    const bool overwrite = args.found("overwrite");
+    const bool checkGeometry = args.found("checkGeometry");
+    const bool surfaceSimplify = args.found("surfaceSimplify");
 
     autoPtr<fvMesh> meshPtr;
 
     {
-        word regionName;
-        if (args.optionReadIfPresent("region", regionName))
+        word regionName = fvMesh::defaultRegion;
+        if (args.readIfPresent("region", regionName))
         {
             Info<< "Create mesh " << regionName << " for time = "
                 << runTime.timeName() << nl << endl;
         }
         else
         {
-            regionName = fvMesh::defaultRegion;
             Info<< "Create mesh for time = "
                 << runTime.timeName() << nl << endl;
         }
@@ -792,7 +791,7 @@ int main(int argc, char *argv[])
     if (Pstream::parRun())
     {
         fileName decompDictFile;
-        args.optionReadIfPresent("decomposeParDict", decompDictFile);
+        args.readIfPresent("decomposeParDict", decompDictFile);
 
         // A demand-driven decompositionMethod can have issues finding
         // an alternative decomposeParDict location.
@@ -1663,11 +1662,11 @@ int main(int argc, char *argv[])
 
         labelHashSet includePatches(bMesh.size());
 
-        if (args.optionFound("patches"))
+        if (args.found("patches"))
         {
             includePatches = bMesh.patchSet
             (
-                wordReList(args.optionLookup("patches")())
+                wordReList(args.lookup("patches")())
             );
         }
         else
@@ -1685,7 +1684,7 @@ int main(int argc, char *argv[])
 
         fileName outFileName
         (
-            args.optionLookupOrDefault<fileName>
+            args.lookupOrDefault<fileName>
             (
                 "outFile",
                 "constant/triSurface/simplifiedSurface.stl"
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index 7dea889f86..4413be2783 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     if (!overwrite)
     {
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index b366afe41e..3749162149 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -88,8 +88,8 @@ int main(int argc, char *argv[])
         << " s\n" << endl << endl;
 
 
-    const scalar featureAngle = args.argRead<scalar>(1);
-    const bool overwrite      = args.optionFound("overwrite");
+    const scalar featureAngle = args.read<scalar>(1);
+    const bool overwrite      = args.found("overwrite");
 
     const scalar minCos = Foam::cos(degToRad(featureAngle));
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 6d1cee15ad..4e65c8b219 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -126,20 +126,20 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
     #include "createNamedMesh.H"
 
-    const bool noTopology  = args.optionFound("noTopology");
-    const bool allGeometry = args.optionFound("allGeometry");
-    const bool allTopology = args.optionFound("allTopology");
-    const bool meshQuality = args.optionFound("meshQuality");
+    const bool noTopology  = args.found("noTopology");
+    const bool allGeometry = args.found("allGeometry");
+    const bool allTopology = args.found("allTopology");
+    const bool meshQuality = args.found("meshQuality");
 
     word surfaceFormat;
-    const bool writeSets = args.optionReadIfPresent("writeSets", surfaceFormat);
+    const bool writeSets = args.readIfPresent("writeSets", surfaceFormat);
     HashSet<word> selectedFields;
-    bool writeFields = args.optionReadIfPresent
+    bool writeFields = args.readIfPresent
     (
         "writeFields",
         selectedFields
     );
-    if (!writeFields && args.optionFound("writeAllFields"))
+    if (!writeFields && args.found("writeAllFields"))
     {
         selectedFields.insert("nonOrthoAngle");
         selectedFields.insert("faceWeight");
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 7c7e02da96..3f7a722fc6 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
     #include "createNamedMesh.H"
 
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     const word oldInstance = mesh.pointsInstance();
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 251f7641e6..d4e978a8f1 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -523,13 +523,13 @@ int main(int argc, char *argv[])
     runTime.functionObjects().off();
 
     Foam::word meshRegionName = polyMesh::defaultRegion;
-    args.optionReadIfPresent("region", meshRegionName);
+    args.readIfPresent("region", meshRegionName);
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     #include "createNamedPolyMesh.H"
 
-    const bool writeObj = args.optionFound("writeObj");
+    const bool writeObj = args.found("writeObj");
 
     const word oldInstance = mesh.pointsInstance();
 
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index f684c14bb7..705683e40b 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const scalar scaleFactor = args.argRead<scalar>(1);
+    const scalar scaleFactor = args.read<scalar>(1);
 
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index b8fc1c298d..a6117cf528 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -97,20 +97,20 @@ int main(int argc, char *argv[])
          FatalError.exit();
     }
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     fileName masterCase = args[1];
     fileName addCase = args[2];
 
     const word masterRegion =
-        args.optionLookupOrDefault<word>
+        args.lookupOrDefault<word>
         (
             "masterRegion",
             polyMesh::defaultRegion
         );
 
     const word addRegion =
-        args.optionLookupOrDefault<word>
+        args.lookupOrDefault<word>
         (
             "masterRegion",
             polyMesh::defaultRegion
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
     const bool specifiedInstance =
     (
         !overwrite
-     && args.optionReadIfPresent("resultTime", meshInstance)
+     && args.readIfPresent("resultTime", meshInstance)
     );
 
     if (specifiedInstance)
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 39a105686f..5fbbae586f 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -304,10 +304,10 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    const bool readDict   = args.optionFound("dict");
-    const bool split      = args.optionFound("split");
-    const bool overwrite  = args.optionFound("overwrite");
-    const bool detectOnly = args.optionFound("detectOnly");
+    const bool readDict   = args.found("dict");
+    const bool split      = args.found("split");
+    const bool overwrite  = args.found("overwrite");
+    const bool detectOnly = args.found("detectOnly");
 
     if (readDict && (split || detectOnly))
     {
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index e06acc0205..f35f3ad5d8 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     if (!overwrite)
     {
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 477d4cbafc..fa273ac807 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createNamedDynamicFvMesh.H"
 
-    const bool checkAMI  = args.optionFound("checkAMI");
+    const bool checkAMI  = args.found("checkAMI");
 
     if (checkAMI)
     {
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index 7945dd43da..012ec8a4c8 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     #include "createNamedPolyMesh.H"
 
     const word zoneName  = args[1];
-    const point outsidePoint = args.argRead<point>(2);
+    const point outsidePoint = args.read<point>(2);
 
     Info<< "Orienting faceZone " << zoneName
         << " such that " << outsidePoint << " is outside"
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 28e55110ec..0234ce16d7 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    const scalar featureAngle = args.argRead<scalar>(1);
+    const scalar featureAngle = args.read<scalar>(1);
     const scalar minCos = Foam::cos(degToRad(featureAngle));
 
     Info<< "Feature:" << featureAngle << endl
@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
         << endl;
 
 
-    const bool splitAllFaces = args.optionFound("splitAllFaces");
+    const bool splitAllFaces = args.found("splitAllFaces");
     if (splitAllFaces)
     {
         Info<< "Splitting all internal faces to create multiple faces"
@@ -417,12 +417,9 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    const bool overwrite = args.optionFound("overwrite");
-    const bool doNotPreserveFaceZones = args.optionFound
-    (
-        "doNotPreserveFaceZones"
-    );
-    const bool concaveMultiCells = args.optionFound("concaveMultiCells");
+    const bool overwrite = args.found("overwrite");
+    const bool doNotPreserveFaceZones = args.found("doNotPreserveFaceZones");
+    const bool concaveMultiCells = args.found("concaveMultiCells");
     if (concaveMultiCells)
     {
         Info<< "Generating multiple cells for points on concave feature edges."
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 3ef8060efa..85fd727e30 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -182,9 +182,9 @@ int main(int argc, char *argv[])
     // Read/construct control dictionary
     //
 
-    const bool readDict = args.optionFound("dict");
-    const bool refineAllCells = args.optionFound("all");
-    const bool overwrite = args.optionFound("overwrite");
+    const bool readDict = args.found("dict");
+    const bool refineAllCells = args.found("all");
+    const bool overwrite = args.found("overwrite");
 
     // List of cells to refine
     labelList refCells;
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 7193d08ed6..f681501641 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -653,9 +653,9 @@ int main(int argc, char *argv[])
     #include "createNamedMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const bool readDict = args.optionFound("dict");
-    const bool doFrontWidth = args.optionFound("frontWidth");
-    const bool overwrite = args.optionFound("overwrite");
+    const bool readDict = args.found("dict");
+    const bool doFrontWidth = args.found("frontWidth");
+    const bool overwrite = args.found("overwrite");
 
     label band;
     scalar profile;
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index 32df0e44f8..fe4790116b 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    vector n1(args.argRead<vector>(1));
+    vector n1(args.read<vector>(1));
     n1 /= mag(n1);
 
-    vector n2(args.argRead<vector>(2));
+    vector n2(args.read<vector>(2));
     n2 /= mag(n2);
 
     const tensor rotT(rotationTensor(n1, n2));
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index a290259e62..6141bec908 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -768,10 +768,10 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    const bool writeVTK = !args.optionFound("noVTK");
-    const bool loop = args.optionFound("loop");
-    const bool batch = args.optionFound("batch");
-    const bool noSync = args.optionFound("noSync");
+    const bool writeVTK = !args.found("noVTK");
+    const bool loop = args.found("loop");
+    const bool batch = args.found("batch");
+    const bool noSync = args.found("noSync");
 
     if (loop && !batch)
     {
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index f6b2dccc50..3b511db95a 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const bool noFlipMap = args.optionFound("noFlipMap");
+    const bool noFlipMap = args.found("noFlipMap");
 
     // Get times list
     (void)timeSelector::selectIfPresent(runTime, args);
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index b5089339b5..f55cba9814 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
     const word setName = args[1];
     const word masterPatch = args[2];
     const word slavePatch = args[3];
-    const bool overwrite = args.optionFound("overwrite");
+    const bool overwrite = args.found("overwrite");
 
     // List of faces to split
     faceSet facesSet(mesh, setName);
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 5326981c9b..c67b886914 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -1487,23 +1487,23 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     word blockedFacesName;
-    if (args.optionReadIfPresent("blockedFaces", blockedFacesName))
+    if (args.readIfPresent("blockedFaces", blockedFacesName))
     {
         Info<< "Reading blocked internal faces from faceSet "
             << blockedFacesName << nl << endl;
     }
 
-    const bool makeCellZones    = args.optionFound("makeCellZones");
-    const bool largestOnly      = args.optionFound("largestOnly");
-    const bool insidePoint      = args.optionFound("insidePoint");
-    const bool useCellZones     = args.optionFound("cellZones");
-    const bool useCellZonesOnly = args.optionFound("cellZonesOnly");
-    const bool useCellZonesFile = args.optionFound("cellZonesFileOnly");
-    const bool overwrite        = args.optionFound("overwrite");
-    const bool detectOnly       = args.optionFound("detectOnly");
-    const bool sloppyCellZones  = args.optionFound("sloppyCellZones");
-    const bool useFaceZones     = args.optionFound("useFaceZones");
-    const bool prefixRegion     = args.optionFound("prefixRegion");
+    const bool makeCellZones    = args.found("makeCellZones");
+    const bool largestOnly      = args.found("largestOnly");
+    const bool insidePoint      = args.found("insidePoint");
+    const bool useCellZones     = args.found("cellZones");
+    const bool useCellZonesOnly = args.found("cellZonesOnly");
+    const bool useCellZonesFile = args.found("cellZonesFileOnly");
+    const bool overwrite        = args.found("overwrite");
+    const bool detectOnly       = args.found("detectOnly");
+    const bool sloppyCellZones  = args.found("sloppyCellZones");
+    const bool useFaceZones     = args.found("useFaceZones");
+    const bool prefixRegion     = args.found("prefixRegion");
 
 
     if
@@ -2001,7 +2001,7 @@ int main(int argc, char *argv[])
 
         if (insidePoint)
         {
-            const point insidePoint = args.optionRead<point>("insidePoint");
+            const point insidePoint = args.opt<point>("insidePoint");
 
             label regionI = -1;
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 453807a36e..437df9614c 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
 
     if (useCommandArgs)
     {
-        if (args.optionFound("dict"))
+        if (args.found("dict"))
         {
             FatalErrorInFunction
                 << "Cannot specify both dictionary and command-line arguments"
@@ -171,21 +171,21 @@ int main(int argc, char *argv[])
     {
         // Carp about inapplicable options
 
-        if (args.optionFound("integral"))
+        if (args.found("integral"))
         {
             FatalErrorInFunction
                 << "Only specify -integral with command-line arguments"
                 << endl;
         }
 
-        if (args.optionFound("partial"))
+        if (args.found("partial"))
         {
             FatalErrorInFunction
                 << "Only specify -partial with command-line arguments"
                 << endl;
         }
 
-        if (args.optionFound("perfect"))
+        if (args.found("perfect"))
         {
             FatalErrorInFunction
                 << "Only specify -perfect with command-line arguments"
@@ -199,8 +199,8 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
-    const bool intermediate = args.optionFound("intermediate");
-    const bool overwrite = args.optionFound("overwrite");
+    const bool intermediate = args.found("intermediate");
+    const bool overwrite = args.found("overwrite");
 
     const word dictName("stitchMeshDict");
 
@@ -210,9 +210,9 @@ int main(int argc, char *argv[])
     if (useCommandArgs)
     {
         // Command argument driven:
-        const int integralCover = args.optionFound("integral");
-        const int partialCover  = args.optionFound("partial");
-        const int perfectCover  = args.optionFound("perfect");
+        const int integralCover = args.found("integral");
+        const int partialCover  = args.found("partial");
+        const int perfectCover  = args.found("perfect");
 
         if ((integralCover + partialCover + perfectCover) > 1)
         {
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
 
     // set up the tolerances for the sliding mesh
     dictionary slidingTolerances;
-    if (args.optionFound("toleranceDict"))
+    if (args.found("toleranceDict"))
     {
         IOdictionary toleranceFile
         (
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index d6ffb904d2..572c039994 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -376,8 +376,8 @@ int main(int argc, char *argv[])
     word meshInstance = mesh.pointsInstance();
     word fieldsInstance = runTime.timeName();
 
-    const bool overwrite = args.optionFound("overwrite");
-    const bool specifiedInstance = args.optionReadIfPresent
+    const bool overwrite = args.found("overwrite");
+    const bool specifiedInstance = args.readIfPresent
     (
         "resultTime",
         fieldsInstance
@@ -396,7 +396,7 @@ int main(int argc, char *argv[])
 
     labelList exposedPatchIDs;
 
-    if (args.optionFound("patch"))
+    if (args.found("patch"))
     {
         const word patchName = args["patch"];
 
@@ -412,9 +412,9 @@ int main(int argc, char *argv[])
         Info<< "Adding exposed internal faces to patch " << patchName
             << nl << endl;
     }
-    else if (args.optionFound("patches"))
+    else if (args.found("patches"))
     {
-        const wordReList patchNames(args.optionRead<wordReList>("patches"));
+        const wordReList patchNames(args.opt<wordReList>("patches"));
 
         exposedPatchIDs = mesh.boundaryMesh().patchSet(patchNames).sortedToc();
 
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index e3df780cab..04c54e2547 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
 
     #include "createNamedPolyMesh.H"
 
-    const bool noSync = args.optionFound("noSync");
+    const bool noSync = args.found("noSync");
 
     const word dictName("topoSetDict");
     #include "setSystemMeshDictionaryIO.H"
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index cfb077fccf..cc25e76b55 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
     #include "addRegionOption.H"
     #include "setRootCase.H"
 
-    const bool doRotateFields = args.optionFound("rotateFields");
+    const bool doRotateFields = args.found("rotateFields");
 
     // Verify that an operation has been specified
     {
@@ -216,11 +216,11 @@ int main(int argc, char *argv[])
             "scale"
         };
 
-        if (!args.optionCount(operationNames))
+        if (!args.count(operationNames))
         {
             FatalError
                 << "No operation supplied, "
-                << "use least one of the following:" << nl
+                << "use at least one of the following:" << nl
                 << "   ";
 
             for (const auto& opName : operationNames)
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
     word regionName = polyMesh::defaultRegion;
     fileName meshDir = polyMesh::meshSubDir;
 
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         meshDir = regionName/polyMesh::meshSubDir;
     }
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
     );
 
     vector v;
-    if (args.optionReadIfPresent("translate", v))
+    if (args.readIfPresent("translate", v))
     {
         Info<< "Translating points by " << v << endl;
 
@@ -267,18 +267,18 @@ int main(int argc, char *argv[])
     }
 
     vector origin;
-    const bool useOrigin = args.optionReadIfPresent("origin", origin);
+    const bool useOrigin = args.readIfPresent("origin", origin);
     if (useOrigin)
     {
         Info<< "Set origin for rotations to " << origin << endl;
         points -= origin;
     }
 
-    if (args.optionFound("rotate"))
+    if (args.found("rotate"))
     {
         Pair<vector> n1n2
         (
-            args.optionLookup("rotate")()
+            args.lookup("rotate")()
         );
         n1n2[0] /= mag(n1n2[0]);
         n1n2[1] /= mag(n1n2[1]);
@@ -294,11 +294,11 @@ int main(int argc, char *argv[])
             rotateFields(args, runTime, rotT);
         }
     }
-    else if (args.optionFound("rotate-angle"))
+    else if (args.found("rotate-angle"))
     {
         const Tuple2<vector, scalar> axisAngle
         (
-            args.optionLookup("rotate-angle")()
+            args.lookup("rotate-angle")()
         );
 
         Info<< "Rotating points " << nl
@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
             rotateFields(args, runTime, quat.R());
         }
     }
-    else if (args.optionReadIfPresent("rollPitchYaw", v))
+    else if (args.readIfPresent("rollPitchYaw", v))
     {
         Info<< "Rotating points by" << nl
             << "    roll  " << v.x() << nl
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
             rotateFields(args, runTime, quat.R());
         }
     }
-    else if (args.optionReadIfPresent("yawPitchRoll", v))
+    else if (args.readIfPresent("yawPitchRoll", v))
     {
         Info<< "Rotating points by" << nl
             << "    yaw   " << v.x() << nl
@@ -360,10 +360,10 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.optionFound("scale"))
+    if (args.found("scale"))
     {
         // Use readList to handle single or multiple values
-        const List<scalar> scaling = args.optionReadList<scalar>("scale");
+        const List<scalar> scaling = args.readList<scalar>("scale");
 
         if (scaling.size() == 1)
         {
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index d8d7c426c2..5ce8d3a894 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -316,14 +316,14 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
-    const bool listIncludes = args.optionFound("includes");
+    const bool listIncludes = args.found("includes");
 
     if (listIncludes)
     {
         Foam::functionEntries::includeEntry::log = true;
     }
 
-    const bool disableEntries = args.optionFound("disableFunctionEntries");
+    const bool disableEntries = args.found("disableFunctionEntries");
     if (disableEntries)
     {
         Info<< "Not expanding variables or dictionary directives" << endl;
@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
     {
         return 0;
     }
-    else if (args.optionFound("expand"))
+    else if (args.found("expand"))
     {
         IOobject::writeBanner(Info)
             <<"//\n// " << dictFileName << "\n//\n";
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
     dictionary diffDict;
     {
         fileName diffFileName;
-        if (args.optionReadIfPresent("diff", diffFileName))
+        if (args.readIfPresent("diff", diffFileName))
         {
             IFstream diffFile(diffFileName);
             if (!diffFile.good())
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
             diffDict.read(diffFile, true);
             optDiff = true;
         }
-        else if (args.optionReadIfPresent("diffEtc", diffFileName))
+        else if (args.readIfPresent("diffEtc", diffFileName))
         {
             fileName foundName = findEtcFile(diffFileName);
             if (foundName.empty())
@@ -409,18 +409,18 @@ int main(int argc, char *argv[])
     }
 
     word scopedName;  // Actually fileName, since it can contain '/' scoping
-    if (args.optionReadIfPresent("entry", scopedName))
+    if (args.readIfPresent("entry", scopedName))
     {
         upgradeScope(scopedName);
 
         string newValue;
         if
         (
-            args.optionReadIfPresent("set", newValue)
-         || args.optionReadIfPresent("add", newValue)
+            args.readIfPresent("set", newValue)
+         || args.readIfPresent("add", newValue)
         )
         {
-            const bool overwrite = args.optionFound("set");
+            const bool overwrite = args.found("set");
 
             // Dictionary name and keyword
             const dictAndKeyword dAk(scopedName);
@@ -455,7 +455,7 @@ int main(int argc, char *argv[])
                 Info<< finder.ref();
             }
         }
-        else if (args.optionFound("remove"))
+        else if (args.found("remove"))
         {
             // Dictionary name and keyword
             const dictAndKeyword dAk(scopedName);
@@ -510,14 +510,14 @@ int main(int argc, char *argv[])
                     << "Cannot find entry " << scopedName
                     << exit(FatalIOError, 2);
             }
-            else if (args.optionFound("keywords"))
+            else if (args.found("keywords"))
             {
                 for (const entry& e : finder.dict())
                 {
                     Info<< e.keyword() << endl;
                 }
             }
-            else if (args.optionFound("value"))
+            else if (args.found("value"))
             {
                 if (finder.isDict())
                 {
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
             }
         }
     }
-    else if (args.optionFound("keywords"))
+    else if (args.found("keywords"))
     {
         for (const entry& e : dict)
         {
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index f405e232ff..99447cf15d 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     // enable noConstant by switching
-    if (!args.optionFound("noConstant"))
+    if (!args.found("noConstant"))
     {
         args.setOption("constant", "");
     }
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
     // Optional mesh (used to read Clouds)
     autoPtr<polyMesh> meshPtr;
 
-    const bool enableEntries = args.optionFound("enableFunctionEntries");
+    const bool enableEntries = args.found("enableFunctionEntries");
     if (enableEntries)
     {
         Info<< "Allowing dictionary preprocessing ('#include', '#codeStream')."
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
     fileName meshDir = polyMesh::meshSubDir;
     fileName regionPrefix = "";
     word regionName = polyMesh::defaultRegion;
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         Info<< "Using region " << regionName << nl << endl;
         regionPrefix = regionName;
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
index 3e3931c4c3..4d1852f269 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
@@ -92,14 +92,14 @@ void Foam::helpTypes::helpBoundary::execute
     word condition(word::null);
     word fieldName(word::null);
 
-    if (args.optionReadIfPresent("browse", condition))
+    if (args.readIfPresent("browse", condition))
     {
         // TODO: strip scoping info if present?
         // e.g. conditions with leading "compressible::" will not be found
         // ".*[fF]vPatchField.*" + className + ".*"
         displayDoc(condition, ".*[fF]vPatchField.*", false, "H");
     }
-    else if (args.optionFound("constraint"))
+    else if (args.found("constraint"))
     {
         HashSet<word> constraintTypes(fvPatch::constraintTypes());
         Info<< "Constraint types:" << nl;
@@ -109,7 +109,7 @@ void Foam::helpTypes::helpBoundary::execute
         }
         Info<< endl;
     }
-    else if (args.optionReadIfPresent("field", fieldName))
+    else if (args.readIfPresent("field", fieldName))
     {
         IOobject fieldHeader
         (
@@ -122,7 +122,7 @@ void Foam::helpTypes::helpBoundary::execute
         // Check for any type of volField
         if (fieldHeader.typeHeaderOk<volScalarField>(false))
         {
-            if (args.optionFound("fixedValue"))
+            if (args.found("fixedValue"))
             {
                 fixedValueFieldConditions<scalar>(fieldHeader);
                 fixedValueFieldConditions<vector>(fieldHeader);
@@ -145,7 +145,7 @@ void Foam::helpTypes::helpBoundary::execute
                 << "Unable to read field " << fieldName << exit(FatalError);
         }
     }
-    else if (args.optionReadIfPresent("fixedValue", fieldName))
+    else if (args.readIfPresent("fixedValue", fieldName))
     {
         FatalErrorInFunction
             << "-field option must be specified when using the -fixedValue "
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
index 81fca4a918..147486cbc5 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
@@ -72,7 +72,7 @@ void Foam::helpTypes::helpFunctionObject::execute
 {
     word function(word::null);
 
-    if (args.optionReadIfPresent("browse", function))
+    if (args.readIfPresent("browse", function))
     {
         displayDoc(function, ".*[fF]unctionObject.*", true, "H");
     }
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
index ac628c09c6..0c045e872c 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
@@ -79,11 +79,11 @@ void Foam::helpTypes::helpSolver::execute
 {
     word solver(word::null);
 
-    if (args.optionReadIfPresent("browse", solver))
+    if (args.readIfPresent("browse", solver))
     {
         displayDoc(solver, ".*solvers/.*Foam/", true, "C");
     }
-    else if (args.optionFound("read"))
+    else if (args.found("read"))
     {
         mesh.time().controlDict().lookup("application") >> solver;
         displayDoc(solver, ".*solvers/.*Foam/", true, "C");
diff --git a/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
index 68f143f4c7..8e7f119db3 100644
--- a/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
     label nProcs = 0;
     instantList timeDirs;
 
-    if (args.optionFound("processor"))
+    if (args.found("processor"))
     {
         // Determine the processor count
         nProcs = fileHandler().nProcs(args.path());
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
     }
 
 
-    if (args.optionFound("rm"))
+    if (args.found("rm"))
     {
         if (nProcs)
         {
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index b5ebfe0806..d07ef482b9 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    const bool expand = args.optionFound("expand");
+    const bool expand = args.found("expand");
 
 
     #include "createNamedMesh.H"
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index d4df33c02e..0ac8b9af1b 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -280,15 +280,17 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    const bool optRegion        = args.optionFound("region");
-    const bool allRegions       = args.optionFound("allRegions");
-    const bool writeCellDist    = args.optionFound("cellDist");
-    const bool copyZero         = args.optionFound("copyZero");
-    const bool copyUniform      = args.optionFound("copyUniform");
-    const bool decomposeSets    = !args.optionFound("noSets");
-    bool decomposeFieldsOnly    = args.optionFound("fields");
-    bool forceOverwrite         = args.optionFound("force");
-    const bool ifRequiredDecomposition = args.optionFound("ifRequired");
+    const bool optRegion        = args.found("region");
+    const bool allRegions       = args.found("allRegions");
+    const bool writeCellDist    = args.found("cellDist");
+    const bool copyZero         = args.found("copyZero");
+    const bool copyUniform      = args.found("copyUniform");
+    const bool decomposeSets    = !args.found("noSets");
+    const bool ifRequiredDecomposition = args.found("ifRequired");
+
+    bool decomposeFieldsOnly = args.found("fields");
+    bool forceOverwrite      = args.found("force");
+
 
     // Set time from database
     #include "createTime.H"
@@ -298,7 +300,7 @@ int main(int argc, char *argv[])
 
     // Allow override of decomposeParDict location
     fileName decompDictFile;
-    args.optionReadIfPresent("decomposeParDict", decompDictFile);
+    args.readIfPresent("decomposeParDict", decompDictFile);
 
     wordList regionNames;
     if (allRegions)
@@ -317,7 +319,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames = {fvMesh::defaultRegion};
-        args.optionReadIfPresent("region", regionNames[0]);
+        args.readIfPresent("region", regionNames[0]);
     }
 
     forAll(regionNames, regioni)
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 6b6e3bb535..2f9da4db15 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -132,9 +132,9 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     wordHashSet selectedFields;
-    args.optionReadIfPresent("fields", selectedFields);
+    args.readIfPresent("fields", selectedFields);
 
-    const bool noFields = args.optionFound("noFields");
+    const bool noFields = args.found("noFields");
 
     if (noFields)
     {
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    const bool noLagrangian = args.optionFound("noLagrangian");
+    const bool noLagrangian = args.found("noLagrangian");
 
     if (noLagrangian)
     {
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     }
 
 
-    const bool noReconstructSets = args.optionFound("noSets");
+    const bool noReconstructSets = args.found("noSets");
 
     if (noReconstructSets)
     {
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 
 
     wordHashSet selectedLagrangianFields;
-    if (args.optionReadIfPresent("lagrangianFields", selectedLagrangianFields))
+    if (args.readIfPresent("lagrangianFields", selectedLagrangianFields))
     {
         if (noLagrangian)
         {
@@ -173,8 +173,8 @@ int main(int argc, char *argv[])
     }
 
 
-    const bool newTimes   = args.optionFound("newTimes");
-    const bool allRegions = args.optionFound("allRegions");
+    const bool newTimes   = args.found("newTimes");
+    const bool allRegions = args.found("allRegions");
 
     wordList regionNames;
     wordList regionDirs;
@@ -195,7 +195,7 @@ int main(int argc, char *argv[])
     else
     {
         regionNames = {fvMesh::defaultRegion};
-        if (args.optionReadIfPresent("region", regionNames[0]))
+        if (args.readIfPresent("region", regionNames[0]))
         {
             regionDirs = regionNames;
         }
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 9051ab86a5..e42eecb04f 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -504,7 +504,7 @@ int main(int argc, char *argv[])
 
     if
     (
-        args.optionReadIfPresent("region", regionName)
+        args.readIfPresent("region", regionName)
      && regionName != polyMesh::defaultRegion
     )
     {
@@ -513,7 +513,7 @@ int main(int argc, char *argv[])
     }
 
     scalar mergeTol = defaultMergeTol;
-    args.optionReadIfPresent("mergeTol", mergeTol);
+    args.readIfPresent("mergeTol", mergeTol);
 
     scalar writeTol = Foam::pow(10.0, -scalar(IOstream::defaultPrecision()));
 
@@ -534,7 +534,8 @@ int main(int argc, char *argv[])
     }
 
 
-    const bool fullMatch = args.optionFound("fullMatch");
+    const bool fullMatch = args.found("fullMatch");
+    const bool writeCellDist = args.found("cellDist");
 
     if (fullMatch)
     {
@@ -546,14 +547,10 @@ int main(int argc, char *argv[])
             << nl << "This assumes a correct decomposition." << endl;
     }
 
-    bool writeCellDist = args.optionFound("cellDist");
-
-
     label nProcs = fileHandler().nProcs(args.path());
 
     Info<< "Found " << nProcs << " processor directories" << nl << endl;
 
-
     // Read all time databases
     PtrList<Time> databases(nProcs);
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index fa5fe90c39..42ebadb05c 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -103,7 +103,7 @@ scalar getMergeDistance
 )
 {
     scalar mergeTol = defaultMergeTol;
-    args.optionReadIfPresent("mergeTol", mergeTol);
+    args.readIfPresent("mergeTol", mergeTol);
 
     const scalar writeTol =
         Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision()));
@@ -2296,12 +2296,12 @@ int main(int argc, char *argv[])
     // (replacement for setRootCase that does not abort)
 
     Foam::argList args(argc, argv);
-    bool decompose = args.optionFound("decompose");
-    const bool reconstruct = args.optionFound("reconstruct");
-    const bool writeCellDist = args.optionFound("cellDist");
-    const bool newTimes = args.optionFound("newTimes");
-    bool overwrite = args.optionFound("overwrite");
+    const bool reconstruct = args.found("reconstruct");
+    const bool writeCellDist = args.found("cellDist");
+    const bool newTimes = args.found("newTimes");
 
+    bool decompose = args.found("decompose");
+    bool overwrite = args.found("overwrite");
 
     if (Foam::sigFpe::requested())
     {
@@ -2476,7 +2476,7 @@ int main(int argc, char *argv[])
     // Determine any region
     word regionName = polyMesh::defaultRegion;
     fileName meshSubDir = polyMesh::meshSubDir;
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         meshSubDir = regionName/polyMesh::meshSubDir;
     }
@@ -2485,7 +2485,7 @@ int main(int argc, char *argv[])
 
     // Allow override of decomposeParDict location
     fileName decompDictFile;
-    args.optionReadIfPresent("decomposeParDict", decompDictFile);
+    args.readIfPresent("decomposeParDict", decompDictFile);
 
 
     // Demand driven lagrangian mapper
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 737b3e5b64..1d3f8e9c46 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -181,12 +181,12 @@ int main(int argc, char *argv[])
     // Default to binary output, unless otherwise specified
     const IOstream::streamFormat format =
     (
-        args.optionFound("ascii")
+        args.found("ascii")
       ? IOstream::ASCII
       : IOstream::BINARY
     );
 
-    const bool nodeValues = args.optionFound("nodeValues");
+    const bool nodeValues = args.found("nodeValues");
 
     cpuTime timer;
     memInfo mem;
@@ -209,8 +209,8 @@ int main(int argc, char *argv[])
     //
     ensightCase::options caseOpts(format);
 
-    caseOpts.nodeValues(args.optionFound("nodeValues"));
-    caseOpts.width(args.optionLookupOrDefault<label>("width", 8));
+    caseOpts.nodeValues(args.found("nodeValues"));
+    caseOpts.width(args.lookupOrDefault<label>("width", 8));
     caseOpts.overwrite(true); // remove existing output directory
 
     // Can also have separate directory for lagrangian
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
     // Define sub-directory name to use for EnSight data.
     // The path to the ensight directory is at case level only
     // - For parallel cases, data only written from master
-    fileName ensightDir = args.optionLookupOrDefault<word>("name", "EnSight");
+    fileName ensightDir = args.lookupOrDefault<word>("name", "EnSight");
     if (!ensightDir.isAbsolute())
     {
         ensightDir = args.rootPath()/args.globalCaseName()/ensightDir;
@@ -231,30 +231,30 @@ int main(int argc, char *argv[])
     // Output configuration (geometry related)
     //
     ensightMesh::options writeOpts(format);
-    writeOpts.noPatches(args.optionFound("noPatches"));
+    writeOpts.noPatches(args.found("noPatches"));
 
-    if (args.optionFound("patches"))
+    if (args.found("patches"))
     {
-        writeOpts.patchSelection(args.optionReadList<wordRe>("patches"));
+        writeOpts.patchSelection(args.readList<wordRe>("patches"));
     }
-    if (args.optionFound("faceZones"))
+    if (args.found("faceZones"))
     {
-        writeOpts.faceZoneSelection(args.optionReadList<wordRe>("faceZones"));
+        writeOpts.faceZoneSelection(args.readList<wordRe>("faceZones"));
     }
 
     //
     // output configuration (field related)
     //
-    const bool noLagrangian = args.optionFound("noLagrangian");
+    const bool noLagrangian = args.found("noLagrangian");
 
     wordReList fieldPatterns;
-    if (args.optionFound("fields"))
+    if (args.found("fields"))
     {
-        fieldPatterns = args.optionReadList<wordRe>("fields");
+        fieldPatterns = args.readList<wordRe>("fields");
     }
 
     word cellZoneName;
-    if (args.optionReadIfPresent("cellZone", cellZoneName))
+    if (args.readIfPresent("cellZone", cellZoneName))
     {
         Info<< "Converting cellZone " << cellZoneName
             << " only (puts outside faces into patch "
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index bac5a91a44..4f1301426c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
     // Default to binary output, unless otherwise specified
     const IOstream::streamFormat format =
     (
-        args.optionFound("ascii")
+        args.found("ascii")
       ? IOstream::ASCII
       : IOstream::BINARY
     );
@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
     //
     ensightCase::options caseOpts(format);
 
-    caseOpts.width(args.optionLookupOrDefault<label>("width", 8));
+    caseOpts.width(args.lookupOrDefault<label>("width", 8));
     caseOpts.overwrite(false); // leave existing output directory
 
     // Can also have separate directory for lagrangian
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
     // Define sub-directory name to use for EnSight data.
     // The path to the ensight directory is at case level only
     // - For parallel cases, data only written from master
-    fileName ensightDir = args.optionLookupOrDefault<word>("name", "Ensight");
+    fileName ensightDir = args.lookupOrDefault<word>("name", "Ensight");
     if (!ensightDir.isAbsolute())
     {
         ensightDir = args.rootPath()/args.globalCaseName()/ensightDir;
@@ -214,11 +214,11 @@ int main(int argc, char *argv[])
 
     // Control for renumbering iterations
     label indexingNumber = 0;
-    const bool optIndex = args.optionReadIfPresent("index", indexingNumber);
-    const bool noLagrangian = args.optionFound("noLagrangian");
+    const bool optIndex = args.readIfPresent("index", indexingNumber);
+    const bool noLagrangian = args.found("noLagrangian");
 
     // Always write the geometry, unless the -noMesh option is specified
-    bool optNoMesh = args.optionFound("noMesh");
+    bool optNoMesh = args.found("noMesh");
 
 
     // Construct the list of ensight parts for the entire mesh
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index f5b7422463..f8f463b626 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -209,10 +209,10 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const bool doWriteInternal = !args.optionFound("noInternal");
-    const bool doFaceZones     = !args.optionFound("noFaceZones");
-    const bool nearCellValue = args.optionFound("nearCellValue");
-    const bool noPointValues = args.optionFound("noPointValues");
+    const bool doWriteInternal = !args.found("noInternal");
+    const bool doFaceZones     = !args.found("noFaceZones");
+    const bool nearCellValue = args.found("nearCellValue");
+    const bool noPointValues = args.found("noPointValues");
 
     if (nearCellValue)
     {
@@ -228,9 +228,9 @@ int main(int argc, char *argv[])
     }
 
     List<wordRe> excludePatches;
-    if (args.optionFound("excludePatches"))
+    if (args.found("excludePatches"))
     {
-        args.optionLookup("excludePatches")() >> excludePatches;
+        args.lookup("excludePatches")() >> excludePatches;
 
         Info<< "Not including patches " << excludePatches << nl << endl;
     }
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
     word faceSetName;
     string pltName = runTime.caseName();
 
-    if (args.optionReadIfPresent("cellSet", cellSetName))
+    if (args.readIfPresent("cellSet", cellSetName))
     {
         pltName = cellSetName;
     }
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
             pltName = pltName.substr(i);
         }
     }
-    args.optionReadIfPresent("faceSet", faceSetName);
+    args.readIfPresent("faceSet", faceSetName);
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
@@ -276,8 +276,8 @@ int main(int argc, char *argv[])
     {
         if
         (
-            args.optionFound("time")
-         || args.optionFound("latestTime")
+            args.found("time")
+         || args.found("latestTime")
          || cellSetName.size()
          || faceSetName.size()
          || regionName != polyMesh::defaultRegion
@@ -325,9 +325,9 @@ int main(int argc, char *argv[])
         IOobjectList objects(mesh, runTime.timeName());
 
         HashSet<word> selectedFields;
-        if (args.optionFound("fields"))
+        if (args.found("fields"))
         {
-            args.optionLookup("fields")() >> selectedFields;
+            args.lookup("fields")() >> selectedFields;
         }
 
         // Construct the vol fields (on the original mesh if subsetted)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index c847be8b96..7e574dcd40 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -285,15 +285,15 @@ vtk::outputOptions getOutputOptions(const argList& args)
 {
     vtk::outputOptions opts;
 
-    if (args.optionFound("xml"))
+    if (args.found("xml"))
     {
-        opts.ascii(args.optionFound("ascii"));
+        opts.ascii(args.found("ascii"));
     }
     else
     {
         opts.legacy(true);
 
-        if (!args.optionFound("ascii"))
+        if (!args.found("ascii"))
         {
             if (sizeof(floatScalar) != 4 || sizeof(label) != 4)
             {
@@ -466,13 +466,13 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
 
-    const bool decomposePoly   = !args.optionFound("poly");
-    const bool doWriteInternal = !args.optionFound("noInternal");
-    const bool doFaceZones     = !args.optionFound("noFaceZones");
-    const bool doLinks         = !args.optionFound("noLinks");
-    const bool useTimeName     = args.optionFound("useTimeName");
-    const bool noLagrangian    = args.optionFound("noLagrangian");
-    const bool nearCellValue   = args.optionFound("nearCellValue");
+    const bool decomposePoly   = !args.found("poly");
+    const bool doWriteInternal = !args.found("noInternal");
+    const bool doFaceZones     = !args.found("noFaceZones");
+    const bool doLinks         = !args.found("noLinks");
+    const bool useTimeName     = args.found("useTimeName");
+    const bool noLagrangian    = args.found("noLagrangian");
+    const bool nearCellValue   = args.found("nearCellValue");
 
     const vtk::outputOptions fmtType = getOutputOptions(args);
 
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    const bool noPointValues = args.optionFound("noPointValues");
+    const bool noPointValues = args.found("noPointValues");
 
     if (noPointValues)
     {
@@ -492,12 +492,12 @@ int main(int argc, char *argv[])
             << nl;
     }
 
-    const bool allPatches = args.optionFound("allPatches");
+    const bool allPatches = args.found("allPatches");
 
     wordReList excludePatches;
-    if (args.optionFound("excludePatches"))
+    if (args.found("excludePatches"))
     {
-        args.optionLookup("excludePatches")() >> excludePatches;
+        args.lookup("excludePatches")() >> excludePatches;
 
         Info<< "Not including patches " << excludePatches << nl << endl;
     }
@@ -506,12 +506,12 @@ int main(int argc, char *argv[])
 
     meshSubsetHelper::subsetType cellSubsetType = meshSubsetHelper::NONE;
     word cellSubsetName;
-    if (args.optionReadIfPresent("cellSet", cellSubsetName))
+    if (args.readIfPresent("cellSet", cellSubsetName))
     {
         vtkName = cellSubsetName;
         cellSubsetType = meshSubsetHelper::SET;
     }
-    else if (args.optionReadIfPresent("cellZone", cellSubsetName))
+    else if (args.readIfPresent("cellZone", cellSubsetName))
     {
         vtkName = cellSubsetName;
         cellSubsetType = meshSubsetHelper::ZONE;
@@ -528,13 +528,13 @@ int main(int argc, char *argv[])
     }
 
     word faceSetName;
-    args.optionReadIfPresent("faceSet", faceSetName);
+    args.readIfPresent("faceSet", faceSetName);
 
     word pointSetName;
-    args.optionReadIfPresent("pointSet", pointSetName);
+    args.readIfPresent("pointSet", pointSetName);
 
     // Define sub-directory name to use for VTK data.
-    const word vtkDirName = args.optionLookupOrDefault<word>("name", "VTK");
+    const word vtkDirName = args.lookupOrDefault<word>("name", "VTK");
 
     #include "createNamedMesh.H"
 
@@ -553,8 +553,8 @@ int main(int argc, char *argv[])
     {
         if
         (
-            args.optionFound("time")
-         || args.optionFound("latestTime")
+            args.found("time")
+         || args.found("latestTime")
          || cellSubsetName.size()
          || faceSetName.size()
          || pointSetName.size()
@@ -702,7 +702,7 @@ int main(int argc, char *argv[])
         IOobjectList objects(mesh, runTime.timeName());
 
         wordHashSet selectedFields;
-        const bool specifiedFields = args.optionReadIfPresent
+        const bool specifiedFields = args.readIfPresent
         (
             "fields",
             selectedFields
@@ -870,7 +870,7 @@ int main(int argc, char *argv[])
 
         // Finite-area mesh and fields - need not exist
 
-        if (args.optionFound("finiteAreaFields"))
+        if (args.found("finiteAreaFields"))
         {
             autoPtr<faMesh> aMeshPtr;
             {
@@ -1154,7 +1154,7 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
-        if (args.optionFound("surfaceFields"))
+        if (args.found("surfaceFields"))
         {
             PtrList<const surfaceScalarField> sScalarFld;
             readFields
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
index 44ddcdeca3..a3cc2ba807 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
     #include "addRegionOption.H"
     #include "setRootCase.H"
 
-    const bool withVTK = args.optionFound("vtk");
+    const bool withVTK = args.found("vtk");
 
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
index 92dd5d14c9..1dc57f1c73 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointMovement/lumpedPointMovement.C
@@ -91,15 +91,15 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     const label maxOut =
-        Foam::max(0, args.optionLookupOrDefault<label>("max", 0));
+        Foam::max(0, args.lookupOrDefault<label>("max", 0));
 
     const label span =
-        Foam::max(1, args.optionLookupOrDefault<label>("span", 1));
+        Foam::max(1, args.lookupOrDefault<label>("span", 1));
 
-    const scalar relax = args.optionLookupOrDefault<scalar>("scale", 1);
+    const scalar relax = args.lookupOrDefault<scalar>("scale", 1);
 
-    const bool slave = args.optionFound("slave");
-    const bool removeLock = args.optionFound("removeLock");
+    const bool slave = args.found("slave");
+    const bool removeLock = args.found("removeLock");
 
     #include "createTime.H"
 
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
index 3103b01422..765d1d028f 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     #include "addRegionOption.H"
     #include "setRootCase.H"
 
-    // const bool verbose = args.optionFound("verbose");
+    // const bool verbose = args.found("verbose");
 
     #include "createTime.H"
 
diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index 37638d2c9f..1b1e0bdfc4 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -217,9 +217,9 @@ int main(int argc, char *argv[])
     runTime.functionObjects().off();
 
     HashSet<word> selectedFields;
-    if (args.optionFound("fields"))
+    if (args.found("fields"))
     {
-        args.optionLookup("fields")() >> selectedFields;
+        args.lookup("fields")() >> selectedFields;
     }
     if (selectedFields.size())
     {
@@ -232,14 +232,14 @@ int main(int argc, char *argv[])
 
 
     int divisions = 1;
-    if (args.optionFound("divisions"))
+    if (args.found("divisions"))
     {
-        args.optionLookup("divisions")() >> divisions;
+        args.lookup("divisions")() >> divisions;
     }
     Info<< "Using " << divisions << " per time interval" << nl << endl;
 
 
-    const word interpolationType = args.optionLookupOrDefault<word>
+    const word interpolationType = args.lookupOrDefault<word>
     (
         "interpolationType",
         "linear"
diff --git a/applications/utilities/postProcessing/postProcess/postProcess.C b/applications/utilities/postProcessing/postProcess/postProcess.C
index d95e3c49a7..e8a18e31b3 100644
--- a/applications/utilities/postProcessing/postProcess/postProcess.C
+++ b/applications/utilities/postProcessing/postProcess/postProcess.C
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    if (args.optionFound("list"))
+    if (args.found("list"))
     {
         functionObjectList::list();
         return 0;
@@ -155,13 +155,13 @@ int main(int argc, char *argv[])
 
     // Initialize the set of selected fields from the command-line options
     functionObjects::fileFieldSelection fields(mesh);
-    if (args.optionFound("fields"))
+    if (args.found("fields"))
     {
-        args.optionLookup("fields")() >> fields;
+        args.lookup("fields")() >> fields;
     }
-    if (args.optionFound("field"))
+    if (args.found("field"))
     {
-        fields.insert(args.optionLookup("field")());
+        fields.insert(args.lookup("field")());
     }
 
     // Externally stored dictionary for functionObjectList
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 7ec7a6c9ed..4355608576 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    if (!args.optionFound("ybl") && !args.optionFound("Cbl"))
+    if (!args.found("ybl") && !args.found("Cbl"))
     {
         FatalErrorInFunction
             << "Neither option 'ybl' or 'Cbl' have been provided to calculate "
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
             << "Please choose either 'ybl' OR 'Cbl'."
             << exit(FatalError);
     }
-    else if (args.optionFound("ybl") && args.optionFound("Cbl"))
+    else if (args.found("ybl") && args.found("Cbl"))
     {
         FatalErrorInFunction
             << "Both 'ybl' and 'Cbl' have been provided to calculate "
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    bool writeNut = args.optionFound("write-nut");
+    const bool writeNut = args.found("write-nut");
 
     #include "createTime.H"
     #include "createNamedMesh.H"
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
index 0405a10aa1..8f8de88d4c 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@@ -59,15 +59,15 @@ y.correctBoundaryConditions();
 // Set the mean boundary-layer thickness
 dimensionedScalar ybl("ybl", dimLength, 0);
 
-if (args.optionFound("ybl"))
+if (args.found("ybl"))
 {
     // If the boundary-layer thickness is provided use it
-    ybl.value() = args.optionRead<scalar>("ybl");
+    ybl.value() = args.opt<scalar>("ybl");
 }
-else if (args.optionFound("Cbl"))
+else if (args.found("Cbl"))
 {
     // Calculate boundary layer thickness as Cbl*mean distance to wall
-    ybl.value() = gAverage(y)*args.optionRead<scalar>("Cbl");
+    ybl.value() = gAverage(y)*args.opt<scalar>("Cbl");
 }
 
 Info<< "\nCreating boundary-layer for U of thickness "
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 52215a5aec..a42d96b90a 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
     forAll(times, timei)
     {
         word instance;
-        if (args.optionFound("instance"))
+        if (args.found("instance"))
         {
             if (times.size() > 1)
             {
@@ -455,7 +455,7 @@ int main(int argc, char *argv[])
                     << exit(FatalError);
             }
 
-            args.optionLookup("instance")() >> instance;
+            args.lookup("instance")() >> instance;
         }
         else
         {
@@ -465,7 +465,7 @@ int main(int argc, char *argv[])
 
         #include "createNamedMesh.H"
 
-        const bool literalRE = args.optionFound("literalRE");
+        const bool literalRE = args.found("literalRE");
         if (literalRE)
         {
             Info<< "Not interpreting any regular expressions (RE)"
@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
                 << " not present." << endl;
         }
 
-        const bool enableEntries = args.optionFound("enableFunctionEntries");
+        const bool enableEntries = args.found("enableFunctionEntries");
         if (enableEntries)
         {
             Info<< "Allowing dictionary preprocessing ('#include', '#codeStream')."
@@ -489,7 +489,7 @@ int main(int argc, char *argv[])
         }
 
 
-        const bool disablePatchGroups = args.optionFound("disablePatchGroups");
+        const bool disablePatchGroups = args.found("disablePatchGroups");
         if (disablePatchGroups)
         {
             Info<< "Not interpreting any keys in the changeDictionary"
@@ -518,7 +518,7 @@ int main(int argc, char *argv[])
 
         const dictionary* replaceDictsPtr = &dict;
 
-        if (args.optionFound("subDict"))
+        if (args.found("subDict"))
         {
             replaceDictsPtr = &dict.subDict(args["subDict"]);
         }
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index 936117a742..13cba2af44 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -81,15 +81,15 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     wordList regionNames(1, fvMesh::defaultRegion);
-    if (!args.optionReadIfPresent("region", regionNames[0]))
+    if (!args.readIfPresent("region", regionNames[0]))
     {
-        args.optionReadIfPresent("regions", regionNames);
+        args.readIfPresent("regions", regionNames);
     }
 
-    const wordRe patchGroup(args.argRead<wordRe>(1));
+    const wordRe patchGroup(args.read<wordRe>(1));
 
     fileName commsDir(runTime.path()/"comms");
-    args.optionReadIfPresent("commsDir", commsDir);
+    args.readIfPresent("commsDir", commsDir);
 
 
     // Make sure region names are in canonical order
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
index 533ced2cff..482876a0d1 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
     (
         "${WM_PROJECT_DIR}/etc/caseDicts/createZeroDirectoryTemplates"
     );
-    if (args.optionFound("templateDir"))
+    if (args.found("templateDir"))
     {
         baseDir = args["templateDir"];
     }
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index b35b5b3707..3446d96959 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -416,16 +416,16 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    const bool isTestRun = args.optionFound("test");
+    const bool isTestRun = args.found("test");
     if (isTestRun)
     {
         Info<< "-test option: no changes made" << nl << endl;
     }
-    const bool enableEntries = args.optionFound("enableFunctionEntries");
+    const bool enableEntries = args.found("enableFunctionEntries");
 
 
     Foam::word regionName = polyMesh::defaultRegion;
-    args.optionReadIfPresent("region", regionName);
+    args.readIfPresent("region", regionName);
 
     fileName regionPrefix = "";
     if (regionName != polyMesh::defaultRegion)
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index be6261d3f0..e359381f15 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -53,7 +53,7 @@ int readNumProcs
 {
     const word dictName = "decomposeParDict";
     fileName dictFile;
-    if (args.optionReadIfPresent(optionName, dictFile) && isDir(dictFile))
+    if (args.readIfPresent(optionName, dictFile) && isDir(dictFile))
     {
         dictFile = dictFile / dictName;
     }
@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
 
     Info<< "Source: " << rootDirSource << " " << caseDirSource << endl;
     word sourceRegion = fvMesh::defaultRegion;
-    if (args.optionFound("sourceRegion"))
+    if (args.found("sourceRegion"))
     {
         sourceRegion = args["sourceRegion"];
         Info<< "Source region: " << sourceRegion << endl;
@@ -304,18 +304,18 @@ int main(int argc, char *argv[])
 
     Info<< "Target: " << rootDirTarget << " " << caseDirTarget << endl;
     word targetRegion = fvMesh::defaultRegion;
-    if (args.optionFound("targetRegion"))
+    if (args.found("targetRegion"))
     {
         targetRegion = args["targetRegion"];
         Info<< "Target region: " << targetRegion << endl;
     }
 
-    const bool parallelSource = args.optionFound("parallelSource");
-    const bool parallelTarget = args.optionFound("parallelTarget");
-    const bool consistent = args.optionFound("consistent");
+    const bool parallelSource = args.found("parallelSource");
+    const bool parallelTarget = args.found("parallelTarget");
+    const bool consistent = args.found("consistent");
 
     meshToMesh0::order mapOrder = meshToMesh0::INTERPOLATE;
-    if (args.optionFound("mapMethod"))
+    if (args.found("mapMethod"))
     {
         const word mapMethod(args["mapMethod"]);
         if (mapMethod == "mapNearest")
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
         Info<< "Mapping method: " << mapMethod << endl;
     }
 
-    const bool subtract = args.optionFound("subtract");
+    const bool subtract = args.found("subtract");
     if (subtract)
     {
         Info<< "Subtracting mapped source field from target" << endl;
diff --git a/applications/utilities/preProcessing/mapFields/setTimeIndex.H b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
index 20012e3d20..d84c85028a 100644
--- a/applications/utilities/preProcessing/mapFields/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
@@ -1,6 +1,6 @@
     instantList sourceTimes = runTimeSource.times();
     label sourceTimeIndex = runTimeSource.timeIndex();
-    if (args.optionFound("sourceTime"))
+    if (args.found("sourceTime"))
     {
         if (args["sourceTime"] == "latestTime")
         {
@@ -11,7 +11,7 @@
             sourceTimeIndex = Time::findClosestTimeIndex
             (
                 sourceTimes,
-                args.optionRead<scalar>("sourceTime")
+                args.opt<scalar>("sourceTime")
             );
         }
     }
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
index fc1173a90a..41a0677fb8 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 
     Info<< "Source: " << rootDirSource << " " << caseDirSource << endl;
     word sourceRegion = fvMesh::defaultRegion;
-    if (args.optionFound("sourceRegion"))
+    if (args.found("sourceRegion"))
     {
         sourceRegion = args["sourceRegion"];
         Info<< "Source region: " << sourceRegion << endl;
@@ -208,13 +208,13 @@ int main(int argc, char *argv[])
 
     Info<< "Target: " << rootDirTarget << " " << caseDirTarget << endl;
     word targetRegion = fvMesh::defaultRegion;
-    if (args.optionFound("targetRegion"))
+    if (args.found("targetRegion"))
     {
         targetRegion = args["targetRegion"];
         Info<< "Target region: " << targetRegion << endl;
     }
 
-    const bool consistent = args.optionFound("consistent");
+    const bool consistent = args.found("consistent");
 
 
     word mapMethod = meshToMesh::interpolationMethodNames_
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
         meshToMesh::imCellVolumeWeight
     ];
 
-    if  (args.optionReadIfPresent("mapMethod", mapMethod))
+    if  (args.readIfPresent("mapMethod", mapMethod))
     {
         Info<< "Mapping method: " << mapMethod << endl;
     }
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
     }
 
     // Optionally override
-    if (args.optionFound("patchMapMethod"))
+    if (args.found("patchMapMethod"))
     {
         patchMapMethod = args["patchMapMethod"];
 
@@ -258,19 +258,19 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    const bool subtract = args.optionFound("subtract");
+    const bool subtract = args.found("subtract");
     if (subtract)
     {
         Info<< "Subtracting mapped source field from target" << endl;
     }
 
     HashSet<word> selectedFields;
-    if (args.optionFound("fields"))
+    if (args.found("fields"))
     {
-        args.optionLookup("fields")() >> selectedFields;
+        args.lookup("fields")() >> selectedFields;
     }
 
-    const bool noLagrangian = args.optionFound("noLagrangian");
+    const bool noLagrangian = args.found("noLagrangian");
 
     #include "createTimes.H"
 
diff --git a/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H b/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
index e1ca52e097..35b2cdc49e 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/setTimeIndex.H
@@ -9,7 +9,7 @@
     }
 
     label sourceTimeIndex = runTimeSource.timeIndex();
-    if (args.optionFound("sourceTime"))
+    if (args.found("sourceTime"))
     {
         if (args["sourceTime"] == "latestTime")
         {
@@ -20,7 +20,7 @@
             sourceTimeIndex = Time::findClosestTimeIndex
             (
                 sourceTimes,
-                args.optionRead<scalar>("sourceTime")
+                args.opt<scalar>("sourceTime")
             );
         }
     }
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 384ae295e7..7bdde7d133 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
     const fileName inFileName2 = args[2];
     const fileName outFileName = args[3];
 
-    const bool addPoint     = args.optionFound("points");
-    const bool mergeRegions = args.optionFound("mergeRegions");
+    const bool addPoint     = args.found("points");
+    const bool mergeRegions = args.found("mergeRegions");
 
-    const scalar scaleFactor = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
 
     if (addPoint)
     {
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 4b2221536e..939895cb0f 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1587,7 +1587,7 @@ int main(int argc, char *argv[])
 
 
     List<Pair<word>> surfaceAndSide;
-    if (args.optionReadIfPresent("trim", surfaceAndSide))
+    if (args.readIfPresent("trim", surfaceAndSide))
     {
         Info<< "Trimming edges with " << surfaceAndSide << endl;
     }
@@ -1595,7 +1595,7 @@ int main(int argc, char *argv[])
 
     // Scale factor for both surfaces:
     const scalar scaleFactor
-        = args.optionLookupOrDefault<scalar>("scale", -1);
+        = args.lookupOrDefault<scalar>("scale", -1);
 
     const word surf1Name(args[2]);
     Info<< "Reading surface " << surf1Name << endl;
@@ -1641,13 +1641,13 @@ int main(int argc, char *argv[])
     surf2.writeStats(Info);
     Info<< endl;
 
-    const bool surf1Baffle = args.optionFound("surf1Baffle");
-    const bool surf2Baffle = args.optionFound("surf2Baffle");
+    const bool surf1Baffle = args.found("surf1Baffle");
+    const bool surf2Baffle = args.found("surf2Baffle");
 
     edgeIntersections edgeCuts1;
     edgeIntersections edgeCuts2;
 
-    const bool invertedSpace = args.optionFound("invertedSpace");
+    const bool invertedSpace = args.found("invertedSpace");
 
     if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
     {
@@ -1663,7 +1663,7 @@ int main(int argc, char *argv[])
     (
         surf1,
         surf2,
-        args.optionFound("perturb"),
+        args.found("perturb"),
         edgeCuts1,
         edgeCuts2
     );
@@ -1673,7 +1673,7 @@ int main(int argc, char *argv[])
     (
         surf1,
         surf2,
-        args.optionFound("perturb"),
+        args.found("perturb"),
         edgeCuts1,
         edgeCuts2
     );
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 8d4eee2d07..b7a4d8a827 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -312,10 +312,10 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const bool checkSelfIntersect = args.optionFound("checkSelfIntersection");
-    const bool splitNonManifold = args.optionFound("splitNonManifold");
+    const bool checkSelfIntersect = args.found("checkSelfIntersection");
+    const bool splitNonManifold = args.found("splitNonManifold");
     const label outputThreshold =
-        args.optionLookupOrDefault("outputThreshold", 10);
+        args.lookupOrDefault("outputThreshold", 10);
 
     Info<< "Reading surface from " << surfFileName << " ..." << nl << endl;
 
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
 
 
     // write bounding box corners
-    if (args.optionFound("blockMesh"))
+    if (args.found("blockMesh"))
     {
         pointField cornerPts(boundBox(surf.points(), false).points());
 
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index 7259bfc5a2..8c5bb041f4 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -71,8 +71,8 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
-    const scalar minLen = args.argRead<scalar>(2);
-    const scalar minQuality = args.argRead<scalar>(3);
+    const scalar minLen = args.read<scalar>(2);
+    const scalar minQuality = args.read<scalar>(3);
     const fileName outFileName = args[4];
 
     Info<< "Reading surface " << inFileName << nl
@@ -87,11 +87,11 @@ int main(int argc, char *argv[])
     triSurface surf
     (
         inFileName,
-        args.optionLookupOrDefault<scalar>("scale", -1)
+        args.lookupOrDefault<scalar>("scale", -1)
     );
     surf.writeStats(Info);
 
-    if (!args.optionFound("noClean"))
+    if (!args.found("noClean"))
     {
         Info<< "Removing duplicate and illegal triangles ..." << nl << endl;
         surf.cleanup(true);
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 72f2b51959..2ac97d8791 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
-    const scalar reduction = args.argRead<scalar>(2);
+    const scalar reduction = args.read<scalar>(2);
     const fileName outFileName = args[3];
 
     if (reduction <= 0 || reduction > 1)
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    const scalar scaleFactor = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
 
     Info<< "Input surface   :" << inFileName << nl
         << "Scaling factor  :" << scaleFactor << nl
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 90c57cf4f5..a56a7ac507 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -96,6 +96,16 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
+    if (args.found("writePrecision"))
+    {
+        const label writePrecision = args.opt<label>("writePrecision");
+
+        IOstream::defaultPrecision(writePrecision);
+        Sout.precision(writePrecision);
+
+        Info<< "Output write precision set to " << writePrecision << endl;
+    }
+
     const fileName importName = args[1];
     const fileName exportName = args[2];
 
@@ -116,17 +126,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    if (args.optionFound("writePrecision"))
-    {
-        label writePrecision = args.optionRead<label>("writePrecision");
-
-        IOstream::defaultPrecision(writePrecision);
-        Sout.precision(writePrecision);
-
-        Info<< "Output write precision set to " << writePrecision << endl;
-    }
-
-    const scalar scaleFactor = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaleFactor = args.lookupOrDefault<scalar>("scale", -1);
 
     Info<< "Reading : " << importName << endl;
     triSurface surf(importName, scaleFactor);
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     surf.writeStats(Info);
     Info<< endl;
 
-    if (args.optionFound("clean"))
+    if (args.found("clean"))
     {
         Info<< "Cleaning up surface" << endl;
         surf.cleanup(true);
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    const bool sortByRegion = args.optionFound("group");
+    const bool sortByRegion = args.found("group");
     if (sortByRegion)
     {
         Info<< "Reordering faces into groups; one per region." << endl;
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 9cd18fc541..b2665694dc 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
         << "\nwriting " << exportName;
 
     scalar scaleFactor = 0;
-    if (args.optionReadIfPresent("scale", scaleFactor) && scaleFactor > 0)
+    if (args.readIfPresent("scale", scaleFactor) && scaleFactor > 0)
     {
         Info<< " with scaling " << scaleFactor << endl;
         mesh.scalePoints(scaleFactor);
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index ef7c045fb6..8b985357c2 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -54,9 +54,9 @@ int main(int argc, char *argv[])
 
     const point samplePt
     (
-        args.optionLookupOrDefault<scalar>("x", 0),
-        args.optionLookupOrDefault<scalar>("y", 0),
-        args.optionLookupOrDefault<scalar>("z", 0)
+        args.lookupOrDefault<scalar>("x", 0),
+        args.lookupOrDefault<scalar>("y", 0),
+        args.lookupOrDefault<scalar>("z", 0)
     );
     Info<< "Looking for nearest face/vertex to " << samplePt << endl;
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index b1700b7254..7630d0dc5d 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 
     const IOdictionary dict(dictIO);
 
-    const scalar dist(args.argRead<scalar>(1));
+    const scalar dist(args.read<scalar>(1));
     const scalar matchTolerance(max(1e-6*dist, SMALL));
     const label maxIters = 100;
 
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 7484b2d4c2..b46dd4f9e6 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -85,10 +85,10 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar density = args.optionLookupOrDefault("density", 1.0);
+    const scalar density = args.lookupOrDefault("density", 1.0);
 
     vector refPt = Zero;
-    bool calcAroundRefPt = args.optionReadIfPresent("referencePoint", refPt);
+    bool calcAroundRefPt = args.readIfPresent("referencePoint", refPt);
 
     const triSurface surf(surfFileName);
 
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     vector cM = Zero;
     tensor J = Zero;
 
-    if (args.optionFound("shellProperties"))
+    if (args.found("shellProperties"))
     {
         momentOfInertia::massPropertiesShell(surf, density, m, cM, J);
     }
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index d7a4c85661..4bfbec9d21 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -606,16 +606,16 @@ int main(int argc, char *argv[])
     runTime.functionObjects().off();
 
     const word inputName(args[1]);
-    const scalar distance(args.argRead<scalar>(2));
-    const scalar extendFactor(args.argRead<scalar>(3));
-    const bool checkSelfIntersect = args.optionFound("checkSelfIntersection");
-    const label nSmooth = args.optionLookupOrDefault("nSmooth", 10);
-    const scalar featureAngle = args.optionLookupOrDefault<scalar>
+    const scalar distance(args.read<scalar>(2));
+    const scalar extendFactor(args.read<scalar>(3));
+    const bool checkSelfIntersect = args.found("checkSelfIntersection");
+    const label nSmooth = args.lookupOrDefault("nSmooth", 10);
+    const scalar featureAngle = args.lookupOrDefault<scalar>
     (
         "featureAngle",
         180
     );
-    const bool debug = args.optionFound("debug");
+    const bool debug = args.found("debug");
 
 
     Info<< "Inflating surface " << inputName
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index f4937211db..511f8ea432 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -146,9 +146,9 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar lambda = args.argRead<scalar>(2);
-    const scalar mu = args.argRead<scalar>(3);
-    const label  iters = args.argRead<label>(4);
+    const scalar lambda = args.read<scalar>(2);
+    const scalar mu = args.read<scalar>(3);
+    const label  iters = args.read<label>(4);
     const fileName outFileName = args[5];
 
     if (lambda < 0 || lambda > 1)
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 
     PackedBoolList fixedPoints(surf1.localPoints().size(), false);
 
-    if (args.optionFound("featureFile"))
+    if (args.found("featureFile"))
     {
         const fileName featureFileName(args["featureFile"]);
         Info<< "Reading features from " << featureFileName << " ..." << endl;
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 02f902ead2..7fe05e8318 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.optionFound("from") || args.optionFound("to"))
+    if (args.found("from") || args.found("to"))
     {
         autoPtr<IOobject> csDictIoPtr;
 
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
         //       is in constant
 
         fileName dictPath;
-        if (args.optionReadIfPresent("dict", dictPath) && isDir(dictPath))
+        if (args.readIfPresent("dict", dictPath) && isDir(dictPath))
         {
             dictPath = dictPath / dictName;
         }
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(csDictIoPtr());
 
-        if (args.optionFound("from"))
+        if (args.found("from"))
         {
             const word csName = args["from"];
 
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csIndex]));
         }
 
-        if (args.optionFound("to"))
+        if (args.found("to"))
         {
             const word csName = args["to"];
 
@@ -250,13 +250,13 @@ int main(int argc, char *argv[])
     {
         MeshedSurface<face> surf(importName);
 
-        if (args.optionFound("clean"))
+        if (args.found("clean"))
         {
             surf.cleanup(true);
         }
 
         scalar scaleIn = 0;
-        if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
+        if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
         {
             Info<< " -scaleIn " << scaleIn << endl;
             surf.scalePoints(scaleIn);
@@ -278,13 +278,13 @@ int main(int argc, char *argv[])
         }
 
         scalar scaleOut = 0;
-        if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
+        if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
         {
             Info<< " -scaleOut " << scaleOut << endl;
             surf.scalePoints(scaleOut);
         }
 
-        if (args.optionFound("tri"))
+        if (args.found("tri"))
         {
             Info<< "triangulate" << endl;
             surf.triangulate();
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 35a5896801..127b6e75f2 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
     Time runTime(args.rootPath(), args.caseName());
 
     const fileName exportName = args[1];
-    const word importName = args.optionLookupOrDefault<word>("name", "default");
+    const word importName = args.lookupOrDefault<word>("name", "default");
 
     // check that writing is supported
     if (!MeshedSurface<face>::canWriteType(exportName.ext(), true))
@@ -137,11 +137,11 @@ int main(int argc, char *argv[])
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.optionFound("from") || args.optionFound("to"))
+    if (args.found("from") || args.found("to"))
     {
         autoPtr<IOobject> ioPtr;
 
-        if (args.optionFound("dict"))
+        if (args.found("dict"))
         {
             const fileName dictPath = args["dict"];
 
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(ioPtr());
 
-        if (args.optionFound("from"))
+        if (args.found("from"))
         {
             const word csName = args["from"];
 
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csIndex]));
         }
 
-        if (args.optionFound("to"))
+        if (args.found("to"))
         {
             const word csName = args["to"];
 
@@ -248,13 +248,13 @@ int main(int argc, char *argv[])
 
     MeshedSurface<face> surf(smesh);
 
-    if (args.optionFound("clean"))
+    if (args.found("clean"))
     {
         surf.cleanup(true);
     }
 
     scalar scaleIn = 0;
-    if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
+    if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
         Info<< " -scaleIn " << scaleIn << endl;
         surf.scalePoints(scaleIn);
@@ -275,7 +275,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleOut = 0;
-    if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
+    if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
         Info<< " -scaleOut " << scaleOut << endl;
         surf.scalePoints(scaleOut);
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 7765d7e650..26f42d62b0 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
 
 
     const fileName importName = args[1];
-    const word exportName = args.optionLookupOrDefault<word>("name", "default");
+    const word exportName = args.lookupOrDefault<word>("name", "default");
 
     // check that reading is supported
     if (!MeshedSurface<face>::canRead(importName, true))
@@ -150,11 +150,11 @@ int main(int argc, char *argv[])
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.optionFound("from") || args.optionFound("to"))
+    if (args.found("from") || args.found("to"))
     {
         autoPtr<IOobject> ioPtr;
 
-        if (args.optionFound("dict"))
+        if (args.found("dict"))
         {
             const fileName dictPath = args["dict"];
 
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(ioPtr());
 
-        if (args.optionFound("from"))
+        if (args.found("from"))
         {
             const word csName = args["from"];
 
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csIndex]));
         }
 
-        if (args.optionFound("to"))
+        if (args.found("to"))
         {
             const word csName = args["to"];
 
@@ -245,14 +245,14 @@ int main(int argc, char *argv[])
 
     MeshedSurface<face> surf(importName);
 
-    if (args.optionFound("clean"))
+    if (args.found("clean"))
     {
         surf.cleanup(true);
     }
 
 
     scalar scaleIn = 0;
-    if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
+    if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
         Info<< " -scaleIn " << scaleIn << endl;
         surf.scalePoints(scaleIn);
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleOut = 0;
-    if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
+    if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
         Info<< " -scaleOut " << scaleOut << endl;
         surf.scalePoints(scaleOut);
diff --git a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
index 760ff6dec9..000b88ca41 100644
--- a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
+++ b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
@@ -112,14 +112,14 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    const bool writeXML = args.optionFound("xml");
-    const bool writeAreas = args.optionFound("areas");
+    const bool writeXML = args.found("xml");
+    const bool writeAreas = args.found("areas");
 
 
     // use UnsortedMeshedSurface, not MeshedSurface to maintain ordering
     UnsortedMeshedSurface<face> surf(importName);
 
-    const scalar scaling = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
     if (scaling > 0)
     {
         Info<< " -scale " << scaling << nl;
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index d67054b407..914d9e4c5a 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     const bool includeProcPatches =
        !(
-            args.optionFound("excludeProcPatches")
+            args.found("excludeProcPatches")
          || Pstream::parRun()
         );
 
@@ -171,11 +171,11 @@ int main(int argc, char *argv[])
 
         labelHashSet includePatches(bMesh.size());
 
-        if (args.optionFound("patches"))
+        if (args.found("patches"))
         {
             includePatches = bMesh.patchSet
             (
-                wordReList(args.optionLookup("patches")())
+                wordReList(args.lookup("patches")())
             );
         }
         else
@@ -195,9 +195,9 @@ int main(int argc, char *argv[])
         const faceZoneMesh& fzm = mesh.faceZones();
         labelHashSet includeFaceZones(fzm.size());
 
-        if (args.optionFound("faceZones"))
+        if (args.found("faceZones"))
         {
-            wordReList zoneNames(args.optionLookup("faceZones")());
+            wordReList zoneNames(args.lookup("faceZones")());
             const wordList allZoneNames(fzm.names());
             forAll(zoneNames, i)
             {
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index 2a06e17075..8253f4d234 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -73,11 +73,11 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const point visiblePoint    = args.argRead<point>(2);
+    const point visiblePoint    = args.read<point>(2);
     const fileName outFileName  = args[3];
 
-    const bool orientInside = args.optionFound("inside");
-    const bool usePierceTest = args.optionFound("usePierceTest");
+    const bool orientInside = args.found("inside");
+    const bool usePierceTest = args.found("usePierceTest");
 
     Info<< "Reading surface from " << surfFileName << nl
         << "Orienting surface such that visiblePoint " << visiblePoint
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
         Info<< "outside" << endl;
     }
 
-    const scalar scaling = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
     if (scaling > 0)
     {
         Info<< "Input scaling: " << scaling << nl;
diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
index 84fa024fe3..b1e69bc0a1 100644
--- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
+++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
@@ -65,10 +65,10 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
 
     const fileName surfFileName = args[1];
-    const scalar   mergeTol = args.argRead<scalar>(2);
+    const scalar   mergeTol = args.read<scalar>(2);
     const fileName outFileName = args[3];
 
-    const scalar scaling = args.optionLookupOrDefault<scalar>("scale", -1);
+    const scalar scaling = args.lookupOrDefault<scalar>("scale", -1);
 
     Info<< "Reading surface from " << surfFileName << " ..." << nl
         << "Merging points within " << mergeTol << " metre." << nl;
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 783b165844..e52fe2aab7 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
         << "Using distribution method "
         << distTypeName << nl << endl;
 
-    const bool keepNonMapped = args.optionFound("keepNonMapped");
+    const bool keepNonMapped = args.found("keepNonMapped");
 
     if (keepNonMapped)
     {
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
     if (distType == distributedTriSurfaceMesh::INDEPENDENT)
     {
         fileName decompDictFile;
-        args.optionReadIfPresent("decomposeParDict", decompDictFile);
+        args.readIfPresent("decomposeParDict", decompDictFile);
 
         // A demand-driven decompositionMethod can have issues finding
         // an alternative decomposeParDict location.
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index ed92b9869c..4bb1eb61e3 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -687,7 +687,7 @@ int main(int argc, char *argv[])
 
     const fileName inSurfName  = args[1];
     const fileName outSurfName = args[2];
-    const bool debug = args.optionFound("debug");
+    const bool debug = args.found("debug");
 
     Info<< "Reading surface from " << inSurfName << endl;
 
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index 3063dacd7d..2c8d782c48 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
     Info<< "Reading surface from " << surfName << " ..." << endl;
 
     word setName;
-    const bool readSet = args.optionReadIfPresent("faceSet", setName);
+    const bool readSet = args.readIfPresent("faceSet", setName);
 
     if (readSet)
     {
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
             << " triangle ..." << endl;
     }
 
-    const scalar searchTol = args.optionLookupOrDefault("tol", 1e-3);
+    const scalar searchTol = args.lookupOrDefault("tol", 1e-3);
 
     // Get search box. Anything not within this box will not be considered.
     const boundBox& meshBb = mesh.bounds();
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 5da320f74d..c854cb5a9a 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -125,11 +125,11 @@ int main(int argc, char *argv[])
             "scale"
         };
 
-        if (!args.optionCount(operationNames))
+        if (!args.count(operationNames))
         {
             FatalError
                 << "No operation supplied, "
-                << "use least one of the following:" << nl
+                << "use at least one of the following:" << nl
                 << "   ";
 
             for (const auto& opName : operationNames)
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
     pointField points(surf1.points());
 
     vector v;
-    if (args.optionReadIfPresent("translate", v))
+    if (args.readIfPresent("translate", v))
     {
         Info<< "Translating points by " << v << endl;
 
@@ -162,18 +162,18 @@ int main(int argc, char *argv[])
     }
 
     vector origin;
-    const bool useOrigin = args.optionReadIfPresent("origin", origin);
+    const bool useOrigin = args.readIfPresent("origin", origin);
     if (useOrigin)
     {
         Info<< "Set origin for rotations to " << origin << endl;
         points -= origin;
     }
 
-    if (args.optionFound("rotate"))
+    if (args.found("rotate"))
     {
         Pair<vector> n1n2
         (
-            args.optionLookup("rotate")()
+            args.lookup("rotate")()
         );
         n1n2[0] /= mag(n1n2[0]);
         n1n2[1] /= mag(n1n2[1]);
@@ -184,11 +184,11 @@ int main(int argc, char *argv[])
 
         points = transform(rotT, points);
     }
-    else if (args.optionFound("rotate-angle"))
+    else if (args.found("rotate-angle"))
     {
         const Tuple2<vector, scalar> axisAngle
         (
-            args.optionLookup("rotate-angle")()
+            args.lookup("rotate-angle")()
         );
 
         Info<< "Rotating points " << nl
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
         Info<< "Rotating points by quaternion " << quat << endl;
         points = transform(quat, points);
     }
-    else if (args.optionReadIfPresent("rollPitchYaw", v))
+    else if (args.readIfPresent("rollPitchYaw", v))
     {
         Info<< "Rotating points by" << nl
             << "    roll  " << v.x() << nl
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
         Info<< "Rotating points by quaternion " << quat << endl;
         points = transform(quat, points);
     }
-    else if (args.optionReadIfPresent("yawPitchRoll", v))
+    else if (args.readIfPresent("yawPitchRoll", v))
     {
         Info<< "Rotating points by" << nl
             << "    yaw   " << v.x() << nl
@@ -235,10 +235,10 @@ int main(int argc, char *argv[])
         points = transform(quat, points);
     }
 
-    if (args.optionFound("scale"))
+    if (args.found("scale"))
     {
         // Use readList to handle single or multiple values
-        const List<scalar> scaling = args.optionReadList<scalar>("scale");
+        const List<scalar> scaling = args.readList<scalar>("scale");
 
         if (scaling.size() == 1)
         {
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index 16320044b6..c60026ed1a 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
-    const bool newFormat = args.optionFound("newFormat");
+    const bool newFormat = args.found("newFormat");
 
     speciesTable species;
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 9918881082..ed2db5b3a3 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -519,9 +519,9 @@ Foam::Time::Time
     (
         *this,
         argList::validOptions.found("withFunctionObjects")
-      ? args.optionFound("withFunctionObjects")
+      ? args.found("withFunctionObjects")
       : argList::validOptions.found("noFunctionObjects")
-      ? !args.optionFound("noFunctionObjects")
+      ? !args.found("noFunctionObjects")
       : false
     )
 {
@@ -534,7 +534,7 @@ Foam::Time::Time
     setControls();
 
     // '-profiling' = force profiling, ignore controlDict entry
-    setMonitoring(args.optionFound("profiling"));
+    setMonitoring(args.found("profiling"));
 }
 
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 7a215e1eaa..15e314f1d2 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -194,7 +194,7 @@ Foam::instantList Foam::timeSelector::select
 
         // Determine latestTime selection (if any)
         // This must appear before the -time option processing
-        if (args.optionFound("latestTime"))
+        if (args.found("latestTime"))
         {
             selectTimes = false;
             latestIdx = times.size() - 1;
@@ -206,7 +206,7 @@ Foam::instantList Foam::timeSelector::select
             }
         }
 
-        if (args.optionFound("time"))
+        if (args.found("time"))
         {
             // Can match 0/, but can never match constant/
             selectTimes = timeSelector(args["time"]).selected(times);
@@ -221,13 +221,13 @@ Foam::instantList Foam::timeSelector::select
         if (constantIdx >= 0)
         {
             // Only add constant/ if specifically requested
-            selectTimes[constantIdx] = args.optionFound("constant");
+            selectTimes[constantIdx] = args.found("constant");
         }
 
         // Special treatment for 0/
         if (zeroIdx >= 0)
         {
-            if (args.optionFound("noZero"))
+            if (args.found("noZero"))
             {
                 // Exclude 0/ if specifically requested
                 selectTimes[zeroIdx] = false;
@@ -235,7 +235,7 @@ Foam::instantList Foam::timeSelector::select
             else if (argList::validOptions.found("withZero"))
             {
                 // With -withZero enabled, drop 0/ unless specifically requested
-                selectTimes[zeroIdx] = args.optionFound("withZero");
+                selectTimes[zeroIdx] = args.found("withZero");
             }
         }
 
@@ -285,11 +285,11 @@ Foam::instantList Foam::timeSelector::selectIfPresent
 {
     if
     (
-        args.optionFound("latestTime")
-     || args.optionFound("time")
-     || args.optionFound("constant")
-     || args.optionFound("noZero")
-     || args.optionFound("withZero")
+        args.found("latestTime")
+     || args.found("time")
+     || args.found("constant")
+     || args.found("noZero")
+     || args.found("withZero")
     )
     {
         return select0(runTime, args);
@@ -309,7 +309,7 @@ Foam::instantList Foam::timeSelector::select
 {
     instantList times(timeSelector::select0(runTime, args));
 
-    if (times.size() && args.optionFound("newTimes"))
+    if (times.size() && args.found("newTimes"))
     {
         List<bool> selectTimes(times.size(), true);
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 824f24db01..24be80d3d8 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -396,11 +396,11 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
     dictionary& functionsDict = controlDict.subDict("functions");
 
     word region;
-    args.optionReadIfPresent("region", region);
+    args.readIfPresent("region", region);
 
     bool modifiedControlDict = false;
 
-    if (args.optionFound("dict"))
+    if (args.found("dict"))
     {
         modifiedControlDict = true;
 
@@ -418,7 +418,7 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
         );
     }
 
-    if (args.optionFound("func"))
+    if (args.found("func"))
     {
         modifiedControlDict = true;
 
@@ -431,7 +431,7 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
         );
     }
 
-    if (args.optionFound("funcs"))
+    if (args.found("funcs"))
     {
         modifiedControlDict = true;
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
index f34695983d..43ea99a0a2 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
@@ -78,7 +78,7 @@ if (argList::postProcess(argc, argv))
 
     #include "setRootCase.H"
 
-    if (args.optionFound("list"))
+    if (args.found("list"))
     {
         functionObjectList::list();
         return 0;
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 7054cf8c98..d0b45021f9 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -171,64 +171,64 @@ static void printBuildInfo(const bool full=true)
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-void Foam::argList::addArgument(const string& argumentName)
+void Foam::argList::addArgument(const string& argName)
 {
-    validArgs.append(argumentName);
+    validArgs.append(argName);
 }
 
 
 void Foam::argList::addBoolOption
 (
-    const word& optionName,
+    const word& optName,
     const string& usage
 )
 {
-    addOption(optionName, "", usage);
+    addOption(optName, "", usage);
 }
 
 
 void Foam::argList::addOption
 (
-    const word& optionName,
+    const word& optName,
     const string& param,
     const string& usage
 )
 {
-    validOptions.set(optionName, param);
+    validOptions.set(optName, param);
     if (!usage.empty())
     {
-        optionUsage.set(optionName, usage);
+        optionUsage.set(optName, usage);
     }
 }
 
 
 void Foam::argList::addOptionCompat
 (
-    const word& optionName,
+    const word& optName,
     std::pair<const char*,int> compat
 )
 {
     validOptionsCompat.insert
     (
         compat.first,
-        std::pair<word,int>(optionName, compat.second)
+        std::pair<word,int>(optName, compat.second)
     );
 }
 
 
 void Foam::argList::addUsage
 (
-    const word& optionName,
+    const word& optName,
     const string& usage
 )
 {
     if (usage.empty())
     {
-        optionUsage.erase(optionName);
+        optionUsage.erase(optName);
     }
     else
     {
-        optionUsage.set(optionName, usage);
+        optionUsage.set(optName, usage);
     }
 }
 
@@ -242,10 +242,10 @@ void Foam::argList::addNote(const string& note)
 }
 
 
-void Foam::argList::removeOption(const word& optionName)
+void Foam::argList::removeOption(const word& optName)
 {
-    validOptions.erase(optionName);
-    optionUsage.erase(optionName);
+    validOptions.erase(optName);
+    optionUsage.erase(optName);
 }
 
 
@@ -419,15 +419,18 @@ bool Foam::argList::postProcess(int argc, char *argv[])
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::word Foam::argList::optionCompat(const word& optionName)
+Foam::word Foam::argList::optionCompat(const word& optName)
 {
+    // NB: optName includes the leading '-' so that the return value
+    // can be used directly
+
     if (!validOptionsCompat.empty())
     {
-        auto canonical = validOptionsCompat.cfind(optionName.substr(1));
+        const auto fnd = validOptionsCompat.cfind(optName.substr(1));
 
-        if (canonical.found())
+        if (fnd.found())
         {
-            const auto& iter = *canonical;
+            const auto& iter = *fnd;
 
             // Emit warning if there is versioning (non-zero) and it is not
             // tagged as future change (ie, ThisVersion > version).
@@ -446,7 +449,7 @@ Foam::word Foam::argList::optionCompat(const word& optionName)
                 std::cerr
                     << "--> FOAM IOWarning :" << nl
                     << "    Found [v" << iter.second << "] '"
-                    << optionName << "' instead of '-"
+                    << optName << "' instead of '-"
                     << iter.first << "' option"
                     << nl
                     << std::endl;
@@ -459,7 +462,7 @@ Foam::word Foam::argList::optionCompat(const word& optionName)
     }
 
     // Nothing found - pass through the original input
-    return optionName;
+    return optName;
 }
 
 
@@ -507,9 +510,9 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
         else if (argv[argi][0] == '-')
         {
             // Appears to be an option
-            const char *optionName = &argv[argi][1];
+            const char *optName = &argv[argi][1];
 
-            if (validOptions.found(optionName))
+            if (validOptions.found(optName))
             {
                 // Known option name
                 args_[nArgs++] = argv[argi];
@@ -625,9 +628,9 @@ Foam::argList::argList
     {
         if (argv[argi][0] == '-')
         {
-            const char *optionName = &argv[argi][1];
+            const char *optName = &argv[argi][1];
 
-            if (validParOptions.found(optionName))
+            if (validParOptions.found(optName))
             {
                 parRunControl_.runPar(argc, argv);
                 break;
@@ -652,9 +655,9 @@ Foam::argList::argList
 
         if (args_[argi][0] == '-')
         {
-            const char *optionName = &args_[argi][1];
+            const char *optName = &args_[argi][1];
 
-            if (!*optionName)
+            if (!*optName)
             {
                 Warning
                     <<"Ignoring lone '-' on the command-line" << endl;
@@ -662,11 +665,11 @@ Foam::argList::argList
             else if
             (
                 (
-                    (optIter = validOptions.cfind(optionName)).found()
+                    (optIter = validOptions.cfind(optName)).found()
                  && !optIter.object().empty()
                 )
              || (
-                    (optIter = validParOptions.cfind(optionName)).found()
+                    (optIter = validParOptions.cfind(optName)).found()
                  && !optIter.object().empty()
                 )
             )
@@ -680,7 +683,7 @@ Foam::argList::argList
                     printBuildInfo(false);
 
                     Info<<nl
-                        <<"Error: option '-" << optionName
+                        <<"Error: option '-" << optName
                         << "' requires an argument" << nl << nl
                         << "See '" << executable_ << " -help' for usage"
                         << nl << nl;
@@ -691,14 +694,14 @@ Foam::argList::argList
                 argListStr_ += ' ';
                 argListStr_ += args_[argi];
                 // Handle duplicates by taking the last -option specified
-                options_.set(optionName, args_[argi]);
+                options_.set(optName, args_[argi]);
             }
             else
             {
                 // All other options (including unknown ones) are simply
                 // registered as existing.
 
-                options_.insert(optionName, "");
+                options_.insert(optName, "");
             }
         }
         else
@@ -916,19 +919,7 @@ void Foam::argList::parse
             {
                 distributed_ = true;
                 source = "-roots";
-                ITstream is("roots", options_["roots"]);
-
-                if (is.size() == 1)
-                {
-                    // Single token - treated like list with one entry
-                    roots.setSize(1);
-
-                    is >> roots[0];
-                }
-                else
-                {
-                    is >> roots;
-                }
+                roots = this->readList<fileName>("roots");
 
                 if (roots.size() != 1)
                 {
@@ -1283,7 +1274,7 @@ Foam::argList::~argList()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::argList::optionCount(const UList<word>& optionNames) const
+Foam::label Foam::argList::count(const UList<word>& optionNames) const
 {
     label n = 0;
     for (const word& optName : optionNames)
@@ -1297,7 +1288,7 @@ Foam::label Foam::argList::optionCount(const UList<word>& optionNames) const
 }
 
 
-Foam::label Foam::argList::optionCount
+Foam::label Foam::argList::count
 (
     std::initializer_list<word> optionNames
 ) const
@@ -1314,30 +1305,25 @@ Foam::label Foam::argList::optionCount
 }
 
 
-bool Foam::argList::setOption(const word& optionName, const string& param)
+bool Foam::argList::setOption(const word& optName, const string& param)
 {
     // Some options are always protected
     if
     (
-        optionName == "case"
-     || optionName == "parallel"
-     || optionName == "roots"
+        optName == "case"
+     || optName == "parallel"
+     || optName == "roots"
     )
     {
         FatalErrorInFunction
-            <<"Option: '" << optionName << "' is protected" << nl
+            <<"Option: '" << optName << "' is protected" << nl
             << exit(FatalError);
         return false;
     }
 
-    if
-    (
-        options_.found(optionName)
-      ? (options_[optionName] != param)
-      : true
-    )
+    if (options_.found(optName) ? (options_[optName] != param) : true)
     {
-        options_.set(optionName, param);
+        options_.set(optName, param);
         return true;
     }
 
@@ -1345,24 +1331,24 @@ bool Foam::argList::setOption(const word& optionName, const string& param)
 }
 
 
-bool Foam::argList::unsetOption(const word& optionName)
+bool Foam::argList::unsetOption(const word& optName)
 {
     // Some options are always protected
     if
     (
-        optionName == "case"
-     || optionName == "parallel"
-     || optionName == "roots"
+        optName == "case"
+     || optName == "parallel"
+     || optName == "roots"
     )
     {
         FatalErrorInFunction
-            <<"Option: '" << optionName << "' is protected" << nl
+            <<"Option: '" << optName << "' is protected" << nl
             << exit(FatalError);
         return false;
     }
 
     // Remove the option, return true if state changed
-    return options_.erase(optionName);
+    return options_.erase(optName);
 }
 
 
@@ -1408,27 +1394,26 @@ void Foam::argList::printUsage(bool full) const
 
     Info<< "\noptions:\n";
 
-    const wordList opts = validOptions.sortedToc();
-    for (const word& optionName : opts)
+    for (const word& optName : validOptions.sortedToc())
     {
-        if (!full)
-        {
-            // Adhoc filtering of some options to suppress
-            if
+        // Ad hoc suppression of some options for regular (non-full) help
+        if
+        (
+            !full
+         &&
             (
-                optionName.startsWith("list")
-             && optionName != "list"
+                // '-listXXX' and '-list-XXX' but not '-list'
+                (optName.size() > 4 && optName.startsWith("list"))
             )
-            {
-                continue;
-            }
+        )
+        {
+            continue;
         }
 
-        Info<< "  -" << optionName;
-        label len = optionName.size() + 3;  // Length includes leading '  -'
-
-        auto optIter = validOptions.cfind(optionName);
+        Info<< "  -" << optName;
+        label len = optName.size() + 3;  // Length includes leading '  -'
 
+        const auto optIter = validOptions.cfind(optName);
         if (optIter().size())
         {
             // Length includes space between option/param and '<>'
@@ -1436,8 +1421,7 @@ void Foam::argList::printUsage(bool full) const
             Info<< " <" << optIter().c_str() << '>';
         }
 
-        auto usageIter = optionUsage.cfind(optionName);
-
+        const auto usageIter = optionUsage.cfind(optName);
         if (usageIter.found())
         {
             printOptionUsage(len, usageIter());
@@ -1560,15 +1544,15 @@ bool Foam::argList::check(bool checkArgs, bool checkOpts) const
         {
             forAllConstIters(options_, iter)
             {
-                const word& optionName = iter.key();
+                const word& optName = iter.key();
                 if
                 (
-                    !validOptions.found(optionName)
-                 && !validParOptions.found(optionName)
+                    !validOptions.found(optName)
+                 && !validParOptions.found(optName)
                 )
                 {
                     FatalError
-                        << "Invalid option: -" << optionName << endl;
+                        << "Invalid option: -" << optName << endl;
                     ok = false;
                 }
             }
@@ -1599,7 +1583,7 @@ bool Foam::argList::checkRootCase() const
         return false;
     }
 
-    fileName pathDir(fileHandler().filePath(path()));
+    const fileName pathDir(fileHandler().filePath(path()));
 
     if (checkProcessorDirectories_ && pathDir.empty() && Pstream::master())
     {
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index ef4951fc72..d47e2149bc 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -148,7 +148,7 @@ class argList
     // Private Member Functions
 
         //- Helper for resolving aliases for -options within validOptionsCompat
-        static word optionCompat(const word& optionName);
+        static word optionCompat(const word& optName);
 
         //- Helper function for printUsage
         static void printOptionUsage
@@ -242,9 +242,12 @@ public:
     virtual ~argList();
 
 
-    // Member functions
+    // Member Functions
 
-        //- Parse
+    // Low-level
+
+        //- Scan for -help, -doc options etc prior to checking the validity
+        //- of other args/opts and finally initialising.
         void parse
         (
             bool checkArgs,
@@ -253,218 +256,274 @@ public:
         );
 
 
-        // Access
+    // Access
 
-            //- Name of executable without the path
-            inline const word& executable() const;
+        //- Name of executable without the path
+        inline const word& executable() const;
 
-            //- Return root path
-            inline const fileName& rootPath() const;
+        //- Return root path
+        inline const fileName& rootPath() const;
 
-            //- Return distributed flag
-            //- (i.e. are rootPaths different on different machines)
-            inline bool distributed() const;
+        //- Return distributed flag
+        //- (i.e. are rootPaths different on different machines)
+        inline bool distributed() const;
 
-            //- Return case name (parallel run) or global case (serial run)
-            inline const fileName& caseName() const;
+        //- Return case name (parallel run) or global case (serial run)
+        inline const fileName& caseName() const;
 
-            //- Return case name
-            inline const fileName& globalCaseName() const;
+        //- Return case name
+        inline const fileName& globalCaseName() const;
 
-            //- Return parRunControl
-            inline const ParRunControl& parRunControl() const;
+        //- Return parRunControl
+        inline const ParRunControl& parRunControl() const;
 
-            //- Return the path to the caseName
-            inline fileName path() const;
+        //- Return the path to the caseName
+        inline fileName path() const;
 
-            //- The command arguments (non-options)
-            inline const stringList& args() const;
+        //- Return the number of arguments
+        inline label size() const;
 
-            //- Non-const access to the command arguments (non-options)
-            inline stringList& args();
+        //- Return arguments
+        inline const stringList& args() const;
 
-            //- Return the number of arguments, which includes the name of
-            //- the executable
-            inline label size() const;
+        //- Non-const access to the command arguments (non-options)
+        inline stringList& args();
 
-            //- Read a value from the argument at the given index.
-            //  Index 0 corresponds to the name of the executable.
-            //  Index 1 corresponds to the first argument.
-            template<class T>
-            inline T argRead(const label argIndex) const;
+        //- Return options
+        inline const HashTable<string>& options() const;
 
-            //- Return the command options
-            inline const HashTable<string>& options() const;
+        //- Return non-const access to the command options
+        inline HashTable<string>& options();
 
-            //- Return non-const access to the command options
-            inline HashTable<string>& options();
+        //- Read a value from the argument at index.
+        //  Index 1 is the first non-option argument.
+        template<class T>
+        inline T read(const label index) const;
 
-            //- Return true if the named option is found
-            inline bool optionFound(const word& optionName) const;
+        //- Return true if the named option is found
+        inline bool found(const word& optName) const;
 
-            //- Return how many of the specified options were used
-            label optionCount(const UList<word>& optionNames) const;
+        //- Return how many of the specified options were used
+        label count(const UList<word>& optionNames) const;
 
-            //- Return how many of the specified options were used
-            label optionCount(std::initializer_list<word> optionNames) const;
+        //- Return how many of the specified options were used
+        label count(std::initializer_list<word> optionNames) const;
 
-            //- Return an input stream for the named option
-            inline IStringStream optionLookup(const word& optionName) const;
+        //- Return an input stream from the named option
+        inline IStringStream lookup(const word& optName) const;
 
-            //- Read a value from the named option
-            template<class T>
-            inline T optionRead(const word& optionName) const;
+        //- Read a value from the named option
+        //  The default template parameter is string (ie, no conversion).
+        template<class T=string>
+        inline T opt(const word& optName) const;
 
-            //- Read a value from the named option if present.
-            //  Return true if the named option was found.
-            template<class T>
-            inline bool optionReadIfPresent
-            (
-                const word& optionName,
-                T& val
-            ) const;
+        //- Read a value from the named option if present.
+        //  \return true if the named option was found.
+        template<class T>
+        inline bool readIfPresent(const word& optName, T& val) const;
 
-            //- Read a value from the named option if present.
-            //  Return true if the named option was found, otherwise
-            //  use the supplied default and return false.
-            template<class T>
-            inline bool optionReadIfPresent
-            (
-                const word& optionName,
-                T& val,
-                const T& deflt
-            ) const;
+        //- Read a value from the named option if present.
+        //  \return true if the named option was found, otherwise
+        //  use the supplied default and return false.
+        template<class T>
+        inline bool readIfPresent
+        (
+            const word& optName,
+            T& val,
+            const T& deflt
+        ) const;
 
-            //- Read a value from the named option if present.
-            //  Return supplied default otherwise.
-            template<class T>
-            inline T optionLookupOrDefault
-            (
-                const word& optionName,
-                const T& deflt
-            ) const;
+        //- Read a value from the named option if present.
+        //  Return supplied default otherwise.
+        template<class T>
+        inline T lookupOrDefault
+        (
+            const word& optName,
+            const T& deflt
+        ) const;
 
-            //- Read a List of values from the named option,
-            //- treating a single entry like a list of size 1.
-            template<class T>
-            inline List<T> optionReadList(const word& optionName) const;
+        //- Read a List of values from the named option,
+        //- treating a single entry like a list of size 1.
+        template<class T>
+        inline List<T> readList(const word& optName) const;
 
 
-            //- Return the argument corresponding to index.
-            //  Index 0 corresponds to the name of the executable.
-            //  Index 1 corresponds to the first argument.
-            inline const string& operator[](const label argIndex) const;
+    // Older style access (including 1712 release)
 
-            //- Return the string associated with the named option
-            inline const string& operator[](const word& optionName) const;
+        //- Read a value from the argument at index.
+        //  Index 1 is the first non-option argument.
+        //  \deprecated in favour of read() - JAN-2018
+        template<class T>
+        inline T argRead(const label index) const;
+
+        //- Return true if the named option is found
+        //  \deprecated in favour of found() - JAN-2018
+        inline bool optionFound(const word& optName) const;
+
+        //- Return an input stream from the named option
+        //  \deprecated in favour of lookup() - JAN-2018
+        inline IStringStream optionLookup(const word& optName) const;
+
+        //- Read a value from the named option
+        //  \deprecated in favour of opt() - JAN-2018
+        template<class T>
+        inline T optionRead(const word& optName) const;
+
+        //- Read a value from the named option if present.
+        //  Return true if the named option was found.
+        //  \deprecated in favour of readIfPresent() - JAN-2018
+        template<class T>
+        inline bool optionReadIfPresent
+        (
+            const word& optName,
+            T& val
+        ) const;
+
+        //- Read a value from the named option if present.
+        //  Return true if the named option was found, otherwise
+        //  use the supplied default and return false.
+        //  \deprecated in favour of readIfPresent() - JAN-2018
+        template<class T>
+        inline bool optionReadIfPresent
+        (
+            const word& optName,
+            T& val,
+            const T& deflt
+        ) const;
+
+        //- Read a value from the named option if present.
+        //  Return supplied default otherwise.
+        //  \deprecated in favour of lookupOrDefault() - JAN-2018
+        template<class T>
+        inline T optionLookupOrDefault
+        (
+            const word& optName,
+            const T& deflt
+        ) const;
+
+        //- Read a List of values from the named option
+        //  \deprecated in favour of readList() - JAN-2018
+        template<class T>
+        inline List<T> optionReadList(const word& optName) const;
 
 
-        // Edit
+    // Edit
 
-            //- Append a (mandatory) argument to validArgs
-            static void addArgument(const string& argumentName);
+        //- Append a (mandatory) argument to validArgs
+        static void addArgument(const string& argName);
 
-            //- Add a bool option to validOptions with usage information
-            static void addBoolOption
-            (
-                const word& optionName,
-                const string& usage = ""
-            );
+        //- Add a bool option to validOptions with usage information
+        static void addBoolOption
+        (
+            const word& optName,
+            const string& usage = ""
+        );
 
-            //- Add an option to validOptions with usage information
-            //  An option with an empty param is a bool option
-            static void addOption
-            (
-                const word& optionName,
-                const string& param = "",
-                const string& usage = ""
-            );
+        //- Add an option to validOptions with usage information
+        //  An option with an empty param is a bool option
+        static void addOption
+        (
+            const word& optName,
+            const string& param = "",
+            const string& usage = ""
+        );
 
-            //- Add an alias for the optionName.
-            //
-            //  \param optionName the currently used option name
-            //      OpenFOAM version for which they were used.
-            //  \param compat alias name and the last OpenFOAM version
-            //      (YYMM) for when the alias was not needed.
-            //      Setting a version of 0 suppresses warnings about the alias.
-            static void addOptionCompat
-            (
-                const word& optionName,
-                std::pair<const char*, int> compat
-            );
+        //- Specify an alias for the option name.
+        //
+        //  \param optName the currently used option name
+        //  \param compat alias name and the last OpenFOAM version
+        //      (YYMM) for when the alias was not needed.
+        //      Setting a version of 0 suppresses warnings about the alias.
+        static void addOptionCompat
+        (
+            const word& optName,
+            std::pair<const char*, int> compat
+        );
 
-            //- Add option usage information to optionUsage
-            static void addUsage
-            (
-                const word& optionName,
-                const string& usage
-            );
+        //- Add option usage information to optionUsage
+        static void addUsage
+        (
+            const word& optName,
+            const string& usage
+        );
 
-            //- Add extra notes for the usage information
-            //  This string is used "as-is" without additional formatting
-            static void addNote(const string& note);
+        //- Add extra notes for the usage information
+        //  This string is used "as-is" without additional formatting
+        static void addNote(const string& note);
 
-            //- Remove option from validOptions and from optionUsage
-            static void removeOption(const word& optionName);
+        //- Remove option from validOptions and from optionUsage
+        static void removeOption(const word& optName);
 
-            //- Flag command arguments as being non-mandatory
-            static void nonMandatoryArgs();
+        //- Flag command arguments as being non-mandatory
+        static void nonMandatoryArgs();
 
-            //- Disable emitting the banner information
-            static void noBanner();
+        //- Disable emitting the banner information
+        static void noBanner();
 
-            //- Banner status (enabled/disabled)
-            static bool bannerEnabled();
+        //- Banner status (enabled/disabled)
+        static bool bannerEnabled();
 
-            //- Remove the 'noFunctionObjects' option,
-            //  optionally adding a 'withFunctionObjects' option instead
-            static void noFunctionObjects(bool addWithOption = false);
+        //- Remove the 'noFunctionObjects' option,
+        //- optionally adding a 'withFunctionObjects' option instead
+        static void noFunctionObjects(bool addWithOption = false);
 
-            //- Suppress JobInfo, overriding controlDict setting
-            static void noJobInfo();
+        //- Suppress JobInfo, overriding controlDict setting
+        static void noJobInfo();
 
-            //- Remove the parallel options
-            static void noParallel();
+        //- Remove the parallel options
+        static void noParallel();
 
-            //- Remove checking of processor directories
-            static void noCheckProcessorDirectories();
+        //- Remove checking of processor directories
+        static void noCheckProcessorDirectories();
 
-            //- Return true if the post-processing option is specified
-            static bool postProcess(int argc, char *argv[]);
+        //- Return true if the post-processing option is specified
+        static bool postProcess(int argc, char *argv[]);
 
-            //- Set option directly (use with caution)
-            //  An option with an empty param is a bool option.
-            //  Not all valid options can also be set: eg, -case, -roots, ...
-            //  \return true if the existing option value was changed or
-            //      did not previously exist.
-            bool setOption(const word& optionName, const string& param="");
+        //- Set option directly (use with caution)
+        //  An option with an empty param is a bool option.
+        //  Not all valid options can also be set: eg, -case, -roots, ...
+        //  Return true if the existing option value needed changing,
+        //  or if the option did not previously exist.
+        bool setOption(const word& optName, const string& param = "");
 
-            //- Unset option directly (use with caution)
-            //  Not all valid options can also be unset: eg, -case, -roots ...
-            //  \return true if the option existed before being unset.
-            bool unsetOption(const word& optionName);
+        //- Unset option directly (use with caution)
+        //  Not all valid options can also be unset: eg, -case, -roots ...
+        //  Return true if the option existed before being unset.
+        bool unsetOption(const word& optName);
 
 
-        // Print
+    // Print
 
-            //- Print notes (if any)
-            void printNotes() const;
+        //- Print notes (if any)
+        void printNotes() const;
 
-            //- Print usage
-            void printUsage(bool full=true) const;
+        //- Print usage
+        void printUsage(bool full=true) const;
 
-            //- Display documentation in browser
-            //  Optionally display the application source code
-            void displayDoc(bool source=false) const;
+        //- Display documentation in browser
+        //  Optionally display the application source code
+        void displayDoc(bool source=false) const;
 
 
-        // Check
+    // Check
 
-            //- Check argument list
-            bool check(bool checkArgs=true, bool checkOpts=true) const;
+        //- Check argument list
+        bool check(bool checkArgs=true, bool checkOpts=true) const;
+
+        //- Check root path and case path
+        bool checkRootCase() const;
+
+
+    // Member Operators
+
+        //- The string corresponding to the argument index.
+        //  Index 0 is the executable.
+        //  Index 1 is the first non-option argument.
+        inline const string& operator[](const label index) const;
+
+        //- The string associated with the named option
+        inline const string& operator[](const word& optName) const;
 
-            //- Check root path and case path
-            bool checkRootCase() const;
 };
 
 
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index 30abffdf47..a286899847 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,6 +69,12 @@ inline Foam::fileName Foam::argList::path() const
 }
 
 
+inline Foam::label Foam::argList::size() const
+{
+    return args_.size();
+}
+
+
 inline const Foam::stringList& Foam::argList::args() const
 {
     return args_;
@@ -81,12 +87,6 @@ inline Foam::stringList& Foam::argList::args()
 }
 
 
-inline Foam::label Foam::argList::size() const
-{
-    return args_.size();
-}
-
-
 inline const Foam::HashTable<Foam::string>& Foam::argList::options() const
 {
     return options_;
@@ -99,18 +99,15 @@ inline Foam::HashTable<Foam::string>& Foam::argList::options()
 }
 
 
-inline bool Foam::argList::optionFound(const word& optionName) const
+inline bool Foam::argList::found(const word& optName) const
 {
-    return options_.found(optionName);
+    return options_.found(optName);
 }
 
 
-inline Foam::IStringStream Foam::argList::optionLookup
-(
-    const word& optionName
-) const
+inline Foam::IStringStream Foam::argList::lookup(const word& optName) const
 {
-    return IStringStream(options_[optionName]);
+    return IStringStream(options_[optName]);
 }
 
 
@@ -118,82 +115,83 @@ inline Foam::IStringStream Foam::argList::optionLookup
 
 namespace Foam
 {
-    //
-    // Specializations for argRead
-    //
+    template<> inline int32_t argList::read<int32_t>(const label index) const
+    {
+        return Foam::readInt32(args_[index]);
+    }
+
+    template<> inline int64_t argList::read<int64_t>(const label index) const
+    {
+        return Foam::readInt64(args_[index]);
+    }
+
+    template<> inline float argList::read<float>(const label index) const
+    {
+        return Foam::readFloat(args_[index]);
+    }
+
+    template<> inline double argList::read<double>(const label index) const
+    {
+        return Foam::readDouble(args_[index]);
+    }
+
+
+    template<> inline int32_t argList::opt<int32_t>(const word& optName) const
+    {
+        return Foam::readInt32(options_[optName]);
+    }
+
+    template<> inline int64_t argList::opt<int64_t>(const word& optName) const
+    {
+        return Foam::readInt64(options_[optName]);
+    }
+
+    template<> inline float argList::opt<float>(const word& optName) const
+    {
+        return Foam::readFloat(options_[optName]);
+    }
+
+    template<> inline double argList::opt<double>(const word& optName) const
+    {
+        return Foam::readDouble(options_[optName]);
+    }
+
 
     template<>
-    inline Foam::string
-    argList::argRead<Foam::string>(const label argIndex) const
+    inline string argList::read<Foam::string>(const label index) const
     {
-        return args_[argIndex];
+        return args_[index];
     }
 
     template<>
-    inline Foam::word
-    argList::argRead<Foam::word>(const label argIndex) const
+    inline word argList::read<Foam::word>(const label index) const
     {
-        return args_[argIndex];
+        return args_[index];
     }
 
     template<>
-    inline Foam::fileName
-    argList::argRead<Foam::fileName>(const label argIndex) const
+    inline fileName argList::read<Foam::fileName>(const label index) const
     {
-        return args_[argIndex];
+        return args_[index];
+    }
+
+
+    template<>
+    inline string argList::opt<Foam::string>(const word& optName) const
+    {
+        return options_[optName];
     }
 
     template<>
-    inline Foam::label
-    argList::argRead<Foam::label>(const label argIndex) const
+    inline word argList::opt<Foam::word>(const word& optName) const
     {
-        return Foam::readLabel(args_[argIndex]);
+        return options_[optName];
     }
 
     template<>
-    inline Foam::scalar
-    argList::argRead<Foam::scalar>(const label argIndex) const
+    inline fileName argList::opt<Foam::fileName>(const word& optName) const
     {
-        return Foam::readScalar(args_[argIndex]);
-    }
-
-    //
-    // Specializations for optionRead
-    //
-
-    template<>
-    inline Foam::string
-    argList::optionRead<Foam::string>(const word& optionName) const
-    {
-        return options_[optionName];
-    }
-
-    template<>
-    inline Foam::word
-    argList::optionRead<Foam::word>(const word& optionName) const
-    {
-        return options_[optionName];
-    }
-
-    template<>
-    inline Foam::fileName
-    argList::optionRead<Foam::fileName>(const word& optionName) const
-    {
-        return options_[optionName];
-    }
-
-    template<>
-    inline Foam::label
-    argList::optionRead<Foam::label>(const word& optionName) const
-    {
-        return Foam::readLabel(options_[optionName]);
-    }
-
-    template<>
-    inline Foam::scalar
-    argList::optionRead<Foam::scalar>(const word& optionName) const
-    {
-        return Foam::readScalar(options_[optionName]);
+        return options_[optName];
     }
 
 }
@@ -202,9 +200,9 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-inline T Foam::argList::argRead(const label argIndex) const
+inline T Foam::argList::read(const label index) const
 {
-    ITstream is(Foam::name(argIndex), args_[argIndex]);
+    ITstream is(Foam::name(index), args_[index]);
 
     T val;
     is >> val;
@@ -215,9 +213,9 @@ inline T Foam::argList::argRead(const label argIndex) const
 
 
 template<class T>
-inline T Foam::argList::optionRead(const word& optionName) const
+inline T Foam::argList::opt(const word& optName) const
 {
-    ITstream is(optionName, options_[optionName]);
+    ITstream is(optName, options_[optName]);
 
     T val;
     is >> val;
@@ -228,15 +226,15 @@ inline T Foam::argList::optionRead(const word& optionName) const
 
 
 template<class T>
-inline bool Foam::argList::optionReadIfPresent
+inline bool Foam::argList::readIfPresent
 (
-    const word& optionName,
+    const word& optName,
     T& val
 ) const
 {
-    if (optionFound(optionName))
+    if (found(optName))
     {
-        val = optionRead<T>(optionName);
+        val = opt<T>(optName);
         return true;
     }
 
@@ -245,14 +243,14 @@ inline bool Foam::argList::optionReadIfPresent
 
 
 template<class T>
-inline bool Foam::argList::optionReadIfPresent
+inline bool Foam::argList::readIfPresent
 (
-    const word& optionName,
+    const word& optName,
     T& val,
     const T& deflt
 ) const
 {
-    if (optionReadIfPresent<T>(optionName, val))
+    if (readIfPresent<T>(optName, val))
     {
         return true;
     }
@@ -263,15 +261,15 @@ inline bool Foam::argList::optionReadIfPresent
 
 
 template<class T>
-inline T Foam::argList::optionLookupOrDefault
+inline T Foam::argList::lookupOrDefault
 (
-    const word& optionName,
+    const word& optName,
     const T& deflt
 ) const
 {
-    if (optionFound(optionName))
+    if (found(optName))
     {
-        return optionRead<T>(optionName);
+        return opt<T>(optName);
     }
 
     return deflt;
@@ -279,14 +277,11 @@ inline T Foam::argList::optionLookupOrDefault
 
 
 template<class T>
-inline Foam::List<T> Foam::argList::optionReadList
-(
-    const word& optionName
-) const
+inline Foam::List<T> Foam::argList::readList(const word& optName) const
 {
     List<T> list;
 
-    ITstream is(optionName, options_[optionName]);
+    ITstream is(optName, options_[optName]);
 
     if (is.size() == 1)
     {
@@ -306,21 +301,84 @@ inline Foam::List<T> Foam::argList::optionReadList
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline const Foam::string& Foam::argList::operator[]
-(
-    const label argIndex
-) const
+inline const Foam::string& Foam::argList::operator[](const label index) const
 {
-    return args_[argIndex];
+    return args_[index];
 }
 
 
-inline const Foam::string& Foam::argList::operator[]
+inline const Foam::string& Foam::argList::operator[](const word& optName) const
+{
+    return options_[optName];
+}
+
+
+// * * * * * * * * * * * * * * * Compatibility * * * * * * * * * * * * * * * //
+
+
+template<class T>
+inline T Foam::argList::argRead(const label index) const
+{
+    return this->read<T>(index);
+}
+
+
+inline bool Foam::argList::optionFound(const word& optName) const
+{
+    return found(optName);
+}
+
+
+inline Foam::IStringStream
+Foam::argList::optionLookup(const word& optName) const
+{
+    return lookup(optName);
+}
+
+
+template<class T>
+inline T Foam::argList::optionRead(const word& optName) const
+{
+    return opt<T>(optName);
+}
+
+
+template<class T>
+inline bool
+Foam::argList::optionReadIfPresent(const word& optName, T& val) const
+{
+    return readIfPresent<T>(optName, val);
+}
+
+
+template<class T>
+inline bool Foam::argList::optionReadIfPresent
 (
-    const word& optionName
+    const word& optName,
+    T& val,
+    const T& deflt
 ) const
 {
-    return options_[optionName];
+    return readIfPresent<T>(optName, val, deflt);
+}
+
+
+template<class T>
+inline T Foam::argList::optionLookupOrDefault
+(
+    const word& optName,
+    const T& deflt
+) const
+{
+    return lookupOrDefault<T>(optName, deflt);
+}
+
+
+template<class T>
+inline Foam::List<T>
+Foam::argList::optionReadList(const word& optName) const
+{
+    return this->readList<T>(optName);
 }
 
 
diff --git a/src/OpenFOAM/include/checkConstantOption.H b/src/OpenFOAM/include/checkConstantOption.H
index 578df75350..f4bc5213de 100644
--- a/src/OpenFOAM/include/checkConstantOption.H
+++ b/src/OpenFOAM/include/checkConstantOption.H
@@ -2,7 +2,7 @@
 
 if
 (
-   !args.optionFound("constant")
+    !args.found("constant")
  && (startTime < Times.size()-1)
  && (Times[startTime].name() == "constant")
 )
diff --git a/src/OpenFOAM/include/checkTimeOption.H b/src/OpenFOAM/include/checkTimeOption.H
index b8b170a822..97327c5339 100644
--- a/src/OpenFOAM/include/checkTimeOption.H
+++ b/src/OpenFOAM/include/checkTimeOption.H
@@ -1,13 +1,13 @@
 // Check -time and -latestTime options
 
-if (args.optionFound("time"))
+if (args.found("time"))
 {
-    Foam::scalar timeValue = args.optionRead<scalar>("time");
+    Foam::scalar timeValue = args.opt<scalar>("time");
 
     startTime = Foam::Time::findClosestTimeIndex(Times, timeValue);
 }
 
-if (args.optionFound("latestTime"))
+if (args.found("latestTime"))
 {
     startTime = Times.size() - 1;
 }
diff --git a/src/OpenFOAM/include/createNamedMesh.H b/src/OpenFOAM/include/createNamedMesh.H
index bfaa243e10..707effa653 100644
--- a/src/OpenFOAM/include/createNamedMesh.H
+++ b/src/OpenFOAM/include/createNamedMesh.H
@@ -1,6 +1,6 @@
-Foam::word regionName;
+Foam::word regionName = Foam::fvMesh::defaultRegion;
 
-if (args.optionReadIfPresent("region", regionName))
+if (args.readIfPresent("region", regionName))
 {
     Foam::Info
         << "Create mesh " << regionName << " for time = "
@@ -8,7 +8,6 @@ if (args.optionReadIfPresent("region", regionName))
 }
 else
 {
-    regionName = Foam::fvMesh::defaultRegion;
     Foam::Info
         << "Create mesh for time = "
         << runTime.timeName() << Foam::nl << Foam::endl;
diff --git a/src/OpenFOAM/include/createNamedPolyMesh.H b/src/OpenFOAM/include/createNamedPolyMesh.H
index 2413a427f2..9d830ff39c 100644
--- a/src/OpenFOAM/include/createNamedPolyMesh.H
+++ b/src/OpenFOAM/include/createNamedPolyMesh.H
@@ -1,6 +1,6 @@
-Foam::word regionName;
+Foam::word regionName = Foam::polyMesh::defaultRegion;
 
-if (args.optionReadIfPresent("region", regionName))
+if (args.readIfPresent("region", regionName))
 {
     Foam::Info
         << "Create polyMesh " << regionName << " for time = "
@@ -8,7 +8,6 @@ if (args.optionReadIfPresent("region", regionName))
 }
 else
 {
-    regionName = Foam::polyMesh::defaultRegion;
     Foam::Info
         << "Create polyMesh for time = "
         << runTime.timeName() << Foam::nl << Foam::endl;
diff --git a/src/OpenFOAM/include/listOutput.H b/src/OpenFOAM/include/listOutput.H
index 876a52f67d..7bddd8fd7b 100644
--- a/src/OpenFOAM/include/listOutput.H
+++ b/src/OpenFOAM/include/listOutput.H
@@ -2,24 +2,24 @@ bool listOptions = false ;
 
 if
 (
-    args.optionFound("listSwitches")
+    args.found("listSwitches")
 )
 {
-    debug::listSwitches(args.optionFound("includeUnsetSwitches"));
+    debug::listSwitches(args.found("includeUnsetSwitches"));
     listOptions = true;
 }
 
 if
 (
-    args.optionFound("listRegisteredSwitches")
+    args.found("listRegisteredSwitches")
 )
 {
-    debug::listRegisteredSwitches(args.optionFound("includeUnsetSwitches"));
+    debug::listRegisteredSwitches(args.found("includeUnsetSwitches"));
     listOptions = true;
 }
 
 #ifdef fvPatchField_H
-if (args.optionFound("listScalarBCs"))
+if (args.found("listScalarBCs"))
 {
     Info<< "scalarBCs"
         << fvPatchField<scalar>::dictionaryConstructorTablePtr_->sortedToc()
@@ -27,7 +27,7 @@ if (args.optionFound("listScalarBCs"))
     listOptions = true;
 }
 
-if (args.optionFound("listVectorBCs"))
+if (args.found("listVectorBCs"))
 {
     Info<< "vectorBCs"
         << fvPatchField<vector>::dictionaryConstructorTablePtr_->sortedToc()
@@ -37,7 +37,7 @@ if (args.optionFound("listVectorBCs"))
 #endif
 
 #ifdef functionObject_H
-if (args.optionFound("listFunctionObjects"))
+if (args.found("listFunctionObjects"))
 {
     Info<< "functionObjects"
         << functionObject::dictionaryConstructorTablePtr_->sortedToc()
@@ -47,7 +47,7 @@ if (args.optionFound("listFunctionObjects"))
 #endif
 
 #ifdef fvOption_H
-if (args.optionFound("listFvOptions"))
+if (args.found("listFvOptions"))
 {
     Info<< "fvOptions"
         << fv::option::dictionaryConstructorTablePtr_->sortedToc()
@@ -57,7 +57,7 @@ if (args.optionFound("listFvOptions"))
 #endif
 
 #ifdef turbulentTransportModel_H
-if (args.optionFound("listTurbulenceModels"))
+if (args.found("listTurbulenceModels"))
 {
     Info<< "Turbulence models"
         << incompressible::turbulenceModel::
@@ -76,7 +76,7 @@ if (args.optionFound("listTurbulenceModels"))
     listOptions = true;
 }
 #elif defined(turbulentFluidThermoModel_H)
-if (args.optionFound("listTurbulenceModels"))
+if (args.found("listTurbulenceModels"))
 {
     Info<< "Turbulence models"
         << compressible::turbulenceModel::
diff --git a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
index 503dff369a..90571b7041 100644
--- a/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setConstantMeshDictionaryIO.H
@@ -1,5 +1,5 @@
 fileName dictPath;
-if (args.optionReadIfPresent("dict", dictPath))
+if (args.readIfPresent("dict", dictPath))
 {
     if (isDir(dictPath))
     {
diff --git a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
index b664940d1a..230fc664d5 100644
--- a/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemMeshDictionaryIO.H
@@ -1,5 +1,5 @@
 fileName dictPath;
-if (args.optionReadIfPresent("dict", dictPath))
+if (args.readIfPresent("dict", dictPath))
 {
     if (isDir(dictPath))
     {
diff --git a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
index 15a812693e..4761a564f8 100644
--- a/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
+++ b/src/OpenFOAM/include/setSystemRunTimeDictionaryIO.H
@@ -1,5 +1,5 @@
 fileName dictPath;
-if (args.optionReadIfPresent("dict", dictPath))
+if (args.readIfPresent("dict", dictPath))
 {
     if (isDir(dictPath))
     {
diff --git a/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H b/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H
index 8ffc1490f5..21b6c092d8 100644
--- a/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H
+++ b/src/dynamicFvMesh/include/createNamedDynamicFvMesh.H
@@ -1,6 +1,6 @@
-    Foam::word regionName;
+    Foam::word regionName = Foam::fvMesh::defaultRegion;
 
-    if (args.optionReadIfPresent("region", regionName))
+    if (args.readIfPresent("region", regionName))
     {
         Foam::Info
             << "Create mesh " << regionName << " for time = "
@@ -8,13 +8,11 @@
     }
     else
     {
-        regionName = Foam::fvMesh::defaultRegion;
         Foam::Info
             << "Create mesh for time = "
             << runTime.timeName() << Foam::nl << Foam::endl;
     }
 
-
     autoPtr<dynamicFvMesh> meshPtr
     (
         dynamicFvMesh::New
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
index ef1eb8396f..1e6b0068a3 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
     instantList timeDirs = timeSelector::select0(runTime, args);
-    const bool calcDirections = args.optionFound("calcDirections");
+    const bool calcDirections = args.found("calcDirections");
 
     #include "createNamedMesh.H"