From 3d608bf06a7cff7d19b73f566e44d444c37c7562 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 5 Mar 2018 13:28:53 +0100
Subject: [PATCH] ENH: remove reliance on the Xfer class (issue #639)

This class is largely a pre-C++11 holdover. It is now possible to
simply use move construct/assignment directly.

In a few rare cases (eg, polyMesh::resetPrimitives) it has been
replaced by an autoPtr.
---
 .../chemFoam/createSingleCellMesh.H           |  11 +-
 .../test/Dictionary/Test-Dictionary.C         |   2 +-
 .../test/DynamicList/Test-DynamicList.C       |   8 +-
 .../test/IListStream/Test-IListStream.C       |   9 +-
 .../test/IndirectList/Test-IndirectList.C     |   2 +-
 applications/test/List/Test-List.C            |   4 +-
 .../test/OListStream/Test-OListStream.C       |  37 +-
 applications/test/PtrList/Test-PtrList.C      |   4 +-
 .../test/dictionary/Test-dictionary.C         |   2 +-
 .../Test-mapDistributePolyMesh.C              |  22 +-
 applications/test/mesh/Test-mesh.C            |   2 +-
 applications/test/parallel/Test-parallel.C    |   2 +-
 .../test/primitivePatch/Test-PrimitivePatch.C |   7 +-
 .../Test-surfaceMeshConvert.C                 |   9 +-
 .../refinementLevel/refinementLevel.C         |   6 +-
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |  38 +-
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   |   2 +-
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   |   5 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |   2 +-
 .../conversion/gambitToFoam/gambitToFoam.L    |   2 +-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |   2 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |  22 +-
 .../mesh/conversion/kivaToFoam/readKivaGrid.H |   2 +-
 .../mesh/conversion/mshToFoam/mshToFoam.C     |  10 +-
 .../netgenNeutralToFoam/netgenNeutralToFoam.C |   2 +-
 .../conversion/plot3dToFoam/plot3dToFoam.C    |   2 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |  33 +-
 .../vtkUnstructuredToFoam.C                   |  10 +-
 .../mesh/generation/blockMesh/blockMesh.C     |   2 +-
 .../extrudeMesh/extrudedMesh/extrudedMesh.H   |  10 +-
 .../extrudedMesh/extrudedMeshTemplates.C      |  20 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |   7 +-
 .../patchToPoly2DMesh/patchToPoly2DMesh.C     |   2 +-
 .../extrude2DMesh/extrude2DMeshApp.C          |  44 +-
 .../cellSizeAndAlignmentGrid.C                |  11 +-
 .../DelaunayMesh/DelaunayMeshIO.C             |  27 +-
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  11 +-
 .../backgroundMeshDecomposition.C             |  15 +-
 .../conformalVoronoiMeshCalcDualMesh.C        |  27 +-
 .../conformalVoronoiMeshIO.C                  |  19 +-
 .../foamyHexMeshBackgroundMesh.C              |  23 +-
 .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C   |   8 +-
 .../foamyQuadMesh/shortEdgeFilter2D.C         |   9 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |  10 +-
 .../manipulation/mirrorMesh/mirrorFvMesh.C    |  14 +-
 .../manipulation/mirrorMesh/mirrorFvMesh.H    |  13 +-
 .../manipulation/renumberMesh/renumberMesh.C  |   8 +-
 .../mesh/manipulation/stitchMesh/stitchMesh.C |   6 +-
 .../decomposePar/domainDecomposition.C        |  44 +-
 .../reconstructParMesh/reconstructParMesh.C   |   4 +-
 .../redistributePar/loadOrCreateMesh.C        |  14 +-
 .../parLagrangianRedistributor.C              |  12 +-
 ...agrangianRedistributorRedistributeFields.C |   6 +-
 .../redistributePar/redistributePar.C         |  76 ++--
 .../steadyParticleTracksTemplates.C           |   4 +-
 .../viewFactorsGen/viewFactorsGen.C           |   6 +-
 .../surfaceMeshImport/surfaceMeshImport.C     |   2 +-
 .../surfaceMeshTriangulate.C                  |  10 +-
 .../searchableSurfaceModifier/cut.C           |   8 +-
 .../algorithms/indexedOctree/treeDataCell.C   |   4 +-
 .../algorithms/indexedOctree/treeDataCell.H   |  14 +-
 .../Lists/BiIndirectList/BiIndirectList.H     |   8 +-
 .../Lists/BiIndirectList/BiIndirectListI.H    |   8 +-
 .../Lists/CompactListList/CompactListList.C   |  10 -
 .../Lists/CompactListList/CompactListList.H   |   6 -
 .../Lists/CompactListList/CompactListListI.H  |   8 -
 .../Lists/DynamicList/DynamicList.H           |   8 +-
 .../Lists/DynamicList/DynamicListI.H          |  19 -
 .../Lists/IndirectList/IndirectList.H         |  10 +-
 .../Lists/IndirectList/IndirectListI.H        |  12 +-
 src/OpenFOAM/containers/Lists/List/List.C     |  21 +-
 src/OpenFOAM/containers/Lists/List/List.H     |   8 +-
 src/OpenFOAM/containers/Lists/List/ListI.H    |   7 -
 .../containers/Lists/PtrList/PtrList.C        |   7 -
 .../containers/Lists/PtrList/PtrList.H        |   7 +-
 .../containers/Lists/PtrList/PtrListI.H       |   7 -
 .../Lists/SortableList/SortableList.C         |  18 +-
 .../Lists/SortableList/SortableList.H         |   7 +-
 .../containers/Lists/UPtrList/UPtrList.H      |   9 +-
 .../containers/Lists/UPtrList/UPtrListI.H     |  28 +-
 .../IOobjects/CompactIOField/CompactIOField.C |  35 +-
 .../IOobjects/CompactIOField/CompactIOField.H |  34 +-
 .../IOobjects/CompactIOList/CompactIOList.C   |  33 +-
 .../IOobjects/CompactIOList/CompactIOList.H   |  35 +-
 .../IOobjects/GlobalIOField/GlobalIOField.C   |  46 +-
 .../IOobjects/GlobalIOField/GlobalIOField.H   |  43 +-
 .../db/IOobjects/GlobalIOList/GlobalIOList.C  |  28 +-
 .../db/IOobjects/GlobalIOList/GlobalIOList.H  |  38 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.C   |  52 ++-
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |  37 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.C     |  28 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.H     |  33 +-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.C       |  24 +-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.H       |  36 +-
 .../db/IOobjects/IOPtrList/IOPtrList.C        |  22 +-
 .../db/IOobjects/IOPtrList/IOPtrList.H        |  38 +-
 .../decomposedBlockData/decomposedBlockData.C |   4 +-
 .../decomposedBlockData/decomposedBlockData.H |  12 +-
 src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H |   4 +-
 .../db/IOstreams/memory/IListStream.H         |  34 +-
 .../db/IOstreams/memory/OListStream.H         |  43 +-
 src/OpenFOAM/db/dictionary/dictionary.C       |  14 +-
 src/OpenFOAM/db/dictionary/dictionary.H       |  15 +-
 .../primitiveEntry/primitiveEntry.C           |   6 +-
 .../primitiveEntry/primitiveEntry.H           |   2 +-
 .../DimensionedField/DimensionedField.C       |  44 +-
 .../DimensionedField/DimensionedField.H       |  17 +-
 .../fields/Fields/DynamicField/DynamicField.H |  41 +-
 .../Fields/DynamicField/DynamicFieldI.H       |  70 ++-
 src/OpenFOAM/fields/Fields/Field/Field.C      | 155 ++++---
 src/OpenFOAM/fields/Fields/Field/Field.H      |  82 ++--
 .../polyMesh/globalMeshData/globalMeshData.C  |  11 +-
 .../mapDistribute/IOmapDistribute.C           |  12 +-
 .../mapDistribute/IOmapDistribute.H           |  14 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.C | 134 +++---
 .../mapPolyMesh/mapDistribute/mapDistribute.H |  79 ++--
 .../mapDistribute/mapDistributeBase.C         |  89 ++--
 .../mapDistribute/mapDistributeBase.H         |  37 +-
 .../mapDistribute/mapDistributeLagrangian.H   |  26 +-
 .../mapDistribute/mapDistributePolyMesh.C     | 122 ++---
 .../mapDistribute/mapDistributePolyMesh.H     |  68 +--
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  56 +--
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       |  50 ++-
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   |  10 +-
 .../meshes/polyMesh/zones/cellZone/cellZone.C |  38 +-
 .../meshes/polyMesh/zones/cellZone/cellZone.H |  27 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.C |  22 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.H |  12 +-
 .../polyMesh/zones/pointZone/pointZone.C      |  38 +-
 .../polyMesh/zones/pointZone/pointZone.H      |  25 +-
 .../meshes/polyMesh/zones/zone/zone.C         |  28 --
 .../meshes/polyMesh/zones/zone/zone.H         |  17 -
 .../PrimitivePatch/PrimitivePatch.C           |   6 +-
 .../PrimitivePatch/PrimitivePatch.H           |   6 +-
 .../meshes/primitiveMesh/primitiveMesh.C      |  21 -
 .../meshes/primitiveMesh/primitiveMesh.H      |  11 -
 .../strings/lists/hashedWordListI.H           |   4 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  22 +-
 .../nutLowReWallFunctionFvPatchScalarField.C  |   2 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  21 +-
 src/conversion/ccm/reader/ccmReaderMesh.C     |  38 +-
 src/conversion/common/reader/meshReader.C     |  23 +-
 src/conversion/fire/FIREMeshReader.C          |  32 +-
 src/conversion/polyDualMesh/polyDualMesh.C    |  24 +-
 .../dynamicFvMesh/dynamicFvMesh.C             |  52 ++-
 .../dynamicFvMesh/dynamicFvMesh.H             |  30 +-
 src/dynamicFvMesh/staticFvMesh/staticFvMesh.C |   8 -
 src/dynamicFvMesh/staticFvMesh/staticFvMesh.H |   2 +-
 .../extrudePatchMesh/extrudePatchMesh.C       |  11 +-
 .../IOmapDistributePolyMesh.C                 |  28 +-
 .../IOmapDistributePolyMesh.H                 |  27 +-
 .../fvMeshDistribute/fvMeshDistribute.C       | 101 ++---
 src/dynamicMesh/fvMeshSubset/fvMeshSubset.C   |  55 ++-
 src/dynamicMesh/fvMeshTools/fvMeshTools.C     |  14 +-
 .../points0/points0MotionSolver.C             |   2 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C |  27 +-
 .../polyTopoChange/hexRef8/hexRef8.C          |   2 +-
 .../polyTopoChange/polyTopoChange.C           |  26 +-
 src/fileFormats/coordSet/coordSet.C           |  35 +-
 src/fileFormats/coordSet/coordSet.H           |  20 +-
 src/fileFormats/starcd/STARCDCore.C           |   4 +-
 .../basicSymmetryFaPatchScalarField.C         |   2 +-
 .../transform/transformFaPatchScalarField.C   |   2 +-
 .../wedge/wedgeFaPatchScalarField.C           |   2 +-
 .../basicSymmetryFvPatchScalarField.C         |   2 +-
 .../transform/transformFvPatchScalarField.C   |   2 +-
 .../processor/processorFvPatchField.C         |  15 +-
 .../processor/processorFvPatchField.H         |   2 +-
 .../symmetryPlaneFvPatchScalarField.C         |   2 +-
 .../wedge/wedgeFvPatchScalarField.C           |   2 +-
 .../turbulentDFSEMInletFvPatchVectorField.C   |   2 +-
 src/finiteVolume/fvMesh/fvMesh.C              |  51 ++-
 src/finiteVolume/fvMesh/fvMesh.H              |  27 +-
 .../regionCoupled/regionCoupledFvPatch.C      |   2 +-
 .../regionCoupled/regionCoupledWallFvPatch.C  |   2 +-
 .../singleCellFvMesh/singleCellFvMesh.C       |  39 +-
 .../field/streamLine/streamLineBase.C         |   4 +-
 .../basic/InteractionLists/InteractionLists.C |  10 +-
 .../blockMesh/blockMesh/blockMeshTopology.C   |   4 +-
 .../snappyHexMeshDriver/snappySnapDriver.C    |   4 +-
 .../AMIInterpolation/AMIInterpolation.C       |   4 +-
 .../AMIInterpolationParallelOps.C             |  13 +-
 .../coordinateSystems/coordinateSystems.C     |   8 +-
 .../coordinateSystems/coordinateSystems.H     |  12 +-
 src/meshTools/edgeMesh/edgeMesh.C             |  93 +---
 src/meshTools/edgeMesh/edgeMesh.H             |  60 ++-
 src/meshTools/edgeMesh/edgeMeshI.H            |  55 ++-
 .../extendedEdgeMesh/extendedEdgeMesh.C       | 211 +++------
 .../extendedEdgeMesh/extendedEdgeMesh.H       |  51 +--
 .../extendedEdgeMesh/extendedEdgeMeshI.H      |  20 +-
 .../extendedEdgeMeshTemplates.C               |  13 +-
 .../extendedFeatureEdgeMesh.C                 |  12 +-
 .../extendedFeatureEdgeMesh.H                 |   6 +-
 .../extendedFeatureEdgeMeshI.H                |  16 +-
 .../extendedFeatureEdgeMeshTemplates.C        |   7 +-
 src/meshTools/indexedOctree/treeDataEdge.C    |   4 +-
 src/meshTools/indexedOctree/treeDataEdge.H    |   2 +-
 src/meshTools/indexedOctree/treeDataFace.C    |   4 +-
 src/meshTools/indexedOctree/treeDataFace.H    |  16 +-
 .../mappedPatchBaseTemplates.C                |  16 +-
 .../polyMeshZipUpCells/polyMeshZipUpCells.C   |   8 +-
 .../searchableSurfaces/searchableSurfaces.C   |   5 +-
 .../triSurfaceLoader/triSurfaceLoader.C       |   7 +-
 .../dynamicOversetFvMesh.C                    |   4 +-
 .../fvMeshPrimitiveLduAddressing.C            |   8 +-
 .../fvMeshPrimitiveLduAddressing.H            |   7 +-
 .../distributedTriSurfaceMesh.C               |  38 +-
 .../cellVolumeWeight/cellVolumeWeightMethod.C |  12 +-
 src/sampling/meshToMesh/meshToMesh.C          |   8 +-
 .../meshToMesh/meshToMeshParallelOps.C        |  13 +-
 .../readers/ensight/ensightSurfaceReader.C    |   4 +-
 .../surfMeshSampler/surfMeshSampler.C         |   3 +-
 src/sampling/surface/isoSurface/isoSurface.C  |  20 +-
 .../surface/isoSurface/isoSurfaceCell.C       |  22 +-
 src/surfMesh/MeshedSurface/MeshedSurface.C    | 384 ++++++++--------
 src/surfMesh/MeshedSurface/MeshedSurface.H    | 418 +++++++++---------
 src/surfMesh/MeshedSurface/MeshedSurfaceIO.C  |  14 +-
 src/surfMesh/MeshedSurface/MeshedSurfaceNew.C |   4 +-
 .../MeshedSurface/MeshedSurfaceZones.C        |   8 +-
 .../MeshedSurfaceIOAllocator.C                |  88 +---
 .../MeshedSurfaceIOAllocator.H                | 148 +++----
 .../ModifiableMeshedSurface.H                 |  26 +-
 .../UnsortedMeshedSurface.C                   | 289 +++++-------
 .../UnsortedMeshedSurface.H                   | 274 ++++++------
 .../UnsortedMeshedSurfaceNew.C                |   7 +-
 src/surfMesh/surfMesh/surfMesh.C              | 231 +++++-----
 src/surfMesh/surfMesh/surfMesh.H              | 232 +++++-----
 src/surfMesh/surfMesh/surfMeshIO.C            |  13 +-
 .../surfZone/surfZone/surfZoneIOList.C        |  56 +--
 .../surfZone/surfZone/surfZoneIOList.H        |  44 +-
 .../surfaceFormats/nas/NASsurfaceFormat.C     |   2 +-
 .../surfaceFormats/obj/OBJsurfaceFormat.C     |   2 +-
 .../surfaceFormats/off/OFFsurfaceFormat.C     |   6 +-
 .../starcd/STARCDsurfaceFormat.C              |   2 +-
 .../surfaceFormats/stl/STLsurfaceFormat.C     |   6 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.C     |   4 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |   8 +-
 .../patches/geometricSurfacePatch.H           |  14 +-
 src/surfMesh/triSurface/triSurface.C          | 147 +++---
 src/surfMesh/triSurface/triSurface.H          |  57 +--
 src/surfMesh/triSurface/triSurfaceIO.C        |   4 +-
 241 files changed, 3106 insertions(+), 3971 deletions(-)

diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index a43af46326..d65e45f44e 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
@@ -1,8 +1,5 @@
 Info<< "Constructing single cell mesh" << nl << endl;
 
-labelList owner(6, label(0));
-labelList neighbour(0);
-
 pointField points(8);
 points[0] = vector(0, 0, 0);
 points[1] = vector(1, 0, 0);
@@ -24,10 +21,10 @@ fvMesh mesh
         runTime,
         IOobject::READ_IF_PRESENT
     ),
-    xferMove<pointField>(points),
-    faces.xfer(),
-    owner.xfer(),
-    neighbour.xfer()
+    std::move(points),
+    std::move(faces),
+    labelList(6, Zero), // owner
+    labelList()         // neighbour
 );
 
 List<polyPatch*> patches(1);
diff --git a/applications/test/Dictionary/Test-Dictionary.C b/applications/test/Dictionary/Test-Dictionary.C
index 251cb2f841..d360c30a3b 100644
--- a/applications/test/Dictionary/Test-Dictionary.C
+++ b/applications/test/Dictionary/Test-Dictionary.C
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
     {
         std::cout<< "iter: " << typeid(*iter).name() << '\n';
 
-        Info<< "elem = " << *(*iter) << endl;
+        // Info<< "elem = " << *(*iter) << endl;
     }
 
     std::cout<< "iter type: "
diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C
index 11111aad00..8ca36068ce 100644
--- a/applications/test/DynamicList/Test-DynamicList.C
+++ b/applications/test/DynamicList/Test-DynamicList.C
@@ -194,13 +194,13 @@ int main(int argc, char *argv[])
 
     printInfo("dlC", dlC, true);
 
-    List<label> lstB(dlC.xfer());
+    List<label> lstB(std::move(dlC));
 
-    Info<< "Transferred to normal list via the xfer() method" << endl;
+    Info<< "Move construct to normal list" << endl;
     printInfo("lstB", lstB, true);
     printInfo("dlC", dlC, true);
 
-    DynamicList<label> dlD(lstB.xfer());
+    DynamicList<label> dlD(std::move(lstB));
 
     Info<< "Transfer construct from normal list" << endl;
     printInfo("lstB", lstB, true);
@@ -279,7 +279,7 @@ int main(int argc, char *argv[])
         Info<< "list in:  " << flatOutput(list1) << nl
             << "list out: " << flatOutput(list2) << endl;
 
-        input2 = std::move(identity(15));
+        input2 = identity(15);  // don't need std::move() on temporary object
         list2 = std::move(input2);
         Info<< "list in:  " << flatOutput(input2) << nl
             << "list out: " << flatOutput(list2) << endl;
diff --git a/applications/test/IListStream/Test-IListStream.C b/applications/test/IListStream/Test-IListStream.C
index 42c5e03883..ceea6ab6e4 100644
--- a/applications/test/IListStream/Test-IListStream.C
+++ b/applications/test/IListStream/Test-IListStream.C
@@ -102,7 +102,14 @@ int main(int argc, char *argv[])
 
     Info<< "transfer contents to a List" << endl;
 
-    IListStream ibuf(obuf.xfer());
+    IListStream ibuf;
+
+    // Reclaim data storage from OListStream -> IListStream
+    {
+        List<char> data;
+        obuf.swap(data);
+        ibuf.swap(data);
+    }
 
     Info<< nl;
     Info<< nl << "input string:";
diff --git a/applications/test/IndirectList/Test-IndirectList.C b/applications/test/IndirectList/Test-IndirectList.C
index 17120cc098..64ac880e0b 100644
--- a/applications/test/IndirectList/Test-IndirectList.C
+++ b/applications/test/IndirectList/Test-IndirectList.C
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
     inplaceReverseList(addresses);
 
-    idl1.resetAddressing(addresses.xfer());
+    idl1.resetAddressing(std::move(addresses));
 
     printInfo(idl1);
 
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index 792705904a..cb158233dd 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -190,8 +190,8 @@ int main(int argc, char *argv[])
     list2.setSize(10, vector(1, 2, 3));
     Info<< "list2: " << list2 << endl;
 
-    List<vector> list3(list2.xfer());
-    Info<< "Transferred via the xfer() method" << endl;
+    List<vector> list3(std::move(list2));
+    Info<< "Move construct" << endl;
     Info<< "list2: " << list2 << nl
         << "list3: " << list3 << endl;
 
diff --git a/applications/test/OListStream/Test-OListStream.C b/applications/test/OListStream/Test-OListStream.C
index 4c3a758f0f..e5e52f2a9d 100644
--- a/applications/test/OListStream/Test-OListStream.C
+++ b/applications/test/OListStream/Test-OListStream.C
@@ -129,7 +129,13 @@ int main(int argc, char *argv[])
 
     Info<< "transfer contents to a List or IListStream" << nl;
 
-    IListStream ibuf(obuf.xfer());
+    IListStream ibuf;
+    // Reclaim data storage from OListStream -> IListStream
+    {
+        List<char> data;
+        obuf.swap(data);
+        ibuf.swap(data);
+    }
 
     Info<<"original:";
     printInfo(obuf);
@@ -141,6 +147,7 @@ int main(int argc, char *argv[])
 
     // Create from other storage types
 
+    List<char> written;
     Info<< nl;
     {
         Info<<"create std::move(List)" << endl;
@@ -163,35 +170,9 @@ int main(int argc, char *argv[])
         toString(Info, list) << endl;
 
         printInfo(buf1);
-    }
-
-    Info<< nl;
-
-    List<char> written;
-    {
-        Info<<"create List.xfer()" << endl;
-        List<char> list(16, 'B');
-
-        Info<<"input:";
-        toString(Info, list) << endl;
-
-        OListStream buf1(list.xfer());
-        for (label i = 0; i < 26; ++i)
-        {
-            buf1 << char('A' + i);
-        }
-        for (label i = 0; i < 26; ++i)
-        {
-            buf1 << char('a' +i);
-        }
-
-        Info<<"orig:";
-        toString(Info, list) << endl;
-
-        printInfo(buf1);
 
         // Move back to written
-        written = buf1.xfer();
+        buf1.swap(written);
 
         printInfo(buf1);
     }
diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index 2c21975835..a2b51cc887 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -147,8 +147,8 @@ int main(int argc, char *argv[])
 
     Info<<"list1: " << list1 << endl;
 
-    PtrList<Scalar> list3(list1.xfer());
-    Info<< "Transferred via the xfer() method" << endl;
+    PtrList<Scalar> list3(std::move(list1));
+    Info<<"Move constructed" << endl;
 
     Info<<"list1: " << list1 << nl
         <<"list2: " << list2 << nl
diff --git a/applications/test/dictionary/Test-dictionary.C b/applications/test/dictionary/Test-dictionary.C
index ae8b2ac89d..393aafe482 100644
--- a/applications/test/dictionary/Test-dictionary.C
+++ b/applications/test/dictionary/Test-dictionary.C
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
                 << "keys: " << dict1.keys() << nl
                 << "patterns: " << dict1.keys(true) << endl;
 
-            dictionary dict2(dict1.xfer());
+            dictionary dict2(std::move(dict1));
 
             Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc() << nl
                 << "dict2.toc(): " << dict2.name() << " " << dict2.toc()
diff --git a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
index a925be3efe..a52f312b2c 100644
--- a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
+++ b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
@@ -51,19 +51,20 @@ int main(int argc, char *argv[])
     const scalar instanceValue(0.005);
 
 
-    IOobject io
+    IOmapDistributePolyMesh map
     (
-        "procAddressing",
-        instance,
-        fvMesh::meshSubDir,
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
+        IOobject
+        (
+            "procAddressing",
+            instance,
+            fvMesh::meshSubDir,
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
     );
 
-    IOmapDistributePolyMesh map(io);
-
     {
         // Load the instance mesh
         runTime.setTime(instanceValue, 0);
@@ -112,7 +113,6 @@ int main(int argc, char *argv[])
             }
         }
 
-
         {
             const mapDistribute& cellMap = map.cellMap();
             pointField cc(mesh.cellCentres());
diff --git a/applications/test/mesh/Test-mesh.C b/applications/test/mesh/Test-mesh.C
index 7af9de9f14..9583ae0c5f 100644
--- a/applications/test/mesh/Test-mesh.C
+++ b/applications/test/mesh/Test-mesh.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
                 runTime,
                 Foam::IOobject::NO_READ
             ),
-            Xfer<pointField>(points),
+            std::move(points),
             shapes,
             boundaryFaces,
             boundaryPatchNames,
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index ec5546c675..7a4e4deae6 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -111,7 +111,7 @@ void testMapDistribute()
     }
 
     // Construct distribute map (destructively)
-    mapDistribute map(constructSize, sendMap.xfer(), recvMap.xfer());
+    mapDistribute map(constructSize, std::move(sendMap), std::move(recvMap));
 
     // Distribute complexData
     map.distribute(complexData);
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index f22c5d921b..64a9dc758e 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -246,15 +246,16 @@ int main(int argc, char *argv[])
         writeFaceFaces(localPoints, localFaces, faceFaces);
     }
 
-    // Test construction from Xfer
+    // Move construct
     {
         faceList patchFaces = patch;
         pointField allPoints = patch.points();
 
         PrimitivePatch<face, List, pointField, point> storedPatch
         (
-            patchFaces.xfer(),
-            allPoints.xfer()
+            patchFaces,
+            allPoints,
+            true
         );
     }
 
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index d65d6956f5..ecc08047d2 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -413,9 +413,9 @@ int main(int argc, char *argv[])
             surf.writeStats(Info);
             Info<< endl;
 
-            ModifiableMeshedSurface<face> tsurf(surf.xfer());
-            // ModifiableMeshedSurface<face> tsurf;
-            // tsurf.reset(surf.xfer());
+            ModifiableMeshedSurface<face> tsurf(std::move(surf));
+            // ModifiableMeshedSurface<face> xtsurf;
+            // xtsurf.transfer(surf);
 
             Info<< "in-progress" << nl;
             surf.writeStats(Info);
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
                     IOobject::NO_WRITE,
                     false
                 ),
-                surf.xfer()
+                std::move(surf)
             );
 
             Info<< "writing surfMesh as well: " << surfOut.objectPath() << endl;
@@ -546,7 +546,6 @@ int main(int argc, char *argv[])
             surfOut.setInstance(runTime.timeName());
 
 
-
             Info<< "writing surfMesh again well: " << surfOut.objectPath()
                 << endl;
             surfOut.write();
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index aeb86ce0f8..463d1b689e 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -214,9 +214,9 @@ int main(int argc, char *argv[])
             runTime.timeName(),
             runTime
         ),
-        xferCopy(mesh.points()),   // could we safely re-use the data?
-        xferCopy(mesh.faces()),
-        xferCopy(mesh.cells())
+        pointField(mesh.points()),  // Could we safely re-use the data?
+        faceList(mesh.faces()),
+        cellList(mesh.cells())
     );
 
     // Add the boundary patches
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index ead8621bc7..2c0f74050a 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -446,27 +446,23 @@ int main(int argc, char *argv[])
     const word defaultFacesName = "defaultFaces";
     word defaultFacesType = emptyPolyPatch::typeName;
 
-    // Create dummy mesh just to find out what are internal/external
-    // faces
-    autoPtr<polyMesh> dummyMesh
+    // Create dummy mesh just to find out what are internal/external faces
+    auto dummyMesh = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                "dummyMesh",
-                runTime.constant(),
-                runTime
-            ),
-            xferCopy(points),
-            cellShapes,
-            faceListList(0),
-            wordList(0),
-            wordList(0),
-            defaultFacesName,
-            defaultFacesType,
-            wordList(0)
-        )
+            "dummyMesh",
+            runTime.constant(),
+            runTime
+        ),
+        pointField(points),  // copy
+        cellShapes,
+        faceListList(),
+        wordList(),
+        wordList(),
+        defaultFacesName,
+        defaultFacesType,
+        wordList()
     );
 
 
@@ -605,7 +601,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cellShapes,
         patchFaces,
         patchNames,
@@ -615,7 +611,7 @@ int main(int argc, char *argv[])
     );
 
 
-    if (cellTypes.size() > 0 || patchNames.size() > 0)
+    if (cellTypes.size() || patchNames.size())
     {
         DynamicList<pointZone*> pz;
         DynamicList<faceZone*> fz;
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 30390ec15d..afaf80aaf1 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -739,7 +739,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cellShapes,
         boundary,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 22e572370e..0f1f12933f 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -945,10 +945,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferCopy(pointField()),
-        xferCopy(faceList()),
-        xferCopy(labelList()),
-        xferCopy(labelList())
+        Zero
     );
 
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 447fd88c72..424a447e69 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -1175,7 +1175,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cellShapes,
         patches,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index a030875180..436d3465b1 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -853,7 +853,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cells,
         boundary,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 92fc68a556..aa936cca0e 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -931,7 +931,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cells,
         boundaryFaces,
         boundaryPatchNames,
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 762bdf92d5..621ced981d 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -1128,17 +1128,13 @@ int main(int argc, char *argv[])
             << nl << endl;
 
         // Create globally numbered surface
-        meshedSurface rawSurface
-        (
-            xferCopy(polyPoints),
-            xferCopyTo<faceList>(boundaryFaces)
-        );
+        meshedSurface rawSurface(polyPoints, boundaryFaces);
 
         // Write locally numbered surface
         meshedSurface
         (
-            xferCopy(rawSurface.localPoints()),
-            xferCopy(rawSurface.localFaces())
+            rawSurface.localPoints(),
+            rawSurface.localFaces()
         ).write(runTime.path()/"boundaryFaces.obj");
     }
 
@@ -1171,14 +1167,14 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(polyPoints),
+        std::move(polyPoints),
         cellVerts,
-        usedPatchFaceVerts,             // boundaryFaces,
-        usedPatchNames,                 // boundaryPatchNames,
+        usedPatchFaceVerts,     // boundaryFaces,
+        usedPatchNames,         // boundaryPatchNames,
         wordList(patchNames.size(), polyPatch::typeName), // boundaryPatchTypes,
-        "defaultFaces",             // defaultFacesName
-        polyPatch::typeName,        // defaultFacesType,
-        wordList(0)                 // boundaryPatchPhysicalTypes
+        "defaultFaces",         // defaultFacesName
+        polyPatch::typeName,    // defaultFacesType,
+        wordList()              // boundaryPatchPhysicalTypes
     );
 
     // Remove files now, to ensure all mesh files written are consistent.
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 2c045ac6e3..c04be1102a 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -565,7 +565,7 @@ polyMesh pShapeMesh
         runTime.constant(),
         runTime
     ),
-    xferMove(points),
+    std::move(points),
     cellShapes,
     boundary,
     patchNames,
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index 7f813bc0d3..63fcf15a74 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -144,14 +144,14 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cells,
-        faceListList(0),
-        wordList(0),
-        wordList(0),
+        faceListList(),
+        wordList(),
+        wordList(),
         "defaultFaces",
         polyPatch::typeName,
-        wordList(0)
+        wordList()
     );
 
     // Set the precision of the points data to 10
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 90e1e948d4..08c4b1e991 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(points),
+        std::move(points),
         cells,
         patchFaces,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 92bc69fcb3..f222e6cdfb 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(newPoints),
+        std::move(newPoints),
         cellShapes,
         boundary,
         patchNames,
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 7d459ec82d..7ff32d9f9c 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -318,25 +318,22 @@ int main(int argc, char *argv[])
     // Construct mesh with default boundary only
     //
 
-    autoPtr<polyMesh> meshPtr
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                polyMesh::defaultRegion,
-                runTime.constant(),
-                runTime
-            ),
-            xferCopy(points),
-            cells,
-            faceListList(0),
-            wordList(0),    // boundaryPatchNames
-            wordList(0),    // boundaryPatchTypes
-            "defaultFaces",
-            polyPatch::typeName,
-            wordList(0)
-        )
+            polyMesh::defaultRegion,
+            runTime.constant(),
+            runTime
+        ),
+        pointField(points),  // Copy of points
+        cells,
+        faceListList(),
+        wordList(),          // boundaryPatchNames
+        wordList(),          // boundaryPatchTypes
+        "defaultFaces",
+        polyPatch::typeName,
+        wordList()
     );
     const polyMesh& mesh = *meshPtr;
 
@@ -531,7 +528,7 @@ int main(int argc, char *argv[])
                     runTime.constant(),
                     runTime
                 ),
-                xferMove(points),
+                std::move(points),
                 cells,
                 patchFaces,
                 patchNames,
diff --git a/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C b/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
index 9b01b9fb22..9b5e480554 100644
--- a/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
+++ b/applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
@@ -68,14 +68,14 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferMove(reader.points()),
+        std::move(reader.points()),
         reader.cells(),
-        faceListList(0),
-        wordList(0),
-        wordList(0),
+        faceListList(),
+        wordList(),
+        wordList(),
         "defaultFaces",
         polyPatch::typeName,
-        wordList(0)
+        wordList()
     );
 
     // Set the precision of the points data to 10
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index c7c23f5933..396c5965d5 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        xferCopy(blocks.points()),           // could we re-use space?
+        pointField(blocks.points()),  // Copy, could we re-use space?
         blocks.cells(),
         blocks.patches(),
         blocks.patchNames(),
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
index 99ecc5e8b4..39f2d42cb9 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H
@@ -63,7 +63,7 @@ class extrudedMesh
 
         //- Construct and return the extruded mesh points
         template<class Face, template<class> class FaceList, class PointField>
-        Xfer<pointField> extrudedPoints
+        pointField extrudedPoints
         (
             const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
             const extrudeModel&
@@ -71,7 +71,7 @@ class extrudedMesh
 
         //- Construct and return the extruded mesh faces
         template<class Face, template<class> class FaceList, class PointField>
-        Xfer<faceList> extrudedFaces
+        faceList extrudedFaces
         (
             const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
             const extrudeModel&
@@ -79,7 +79,7 @@ class extrudedMesh
 
         //- Construct and return the extruded mesh cells
         template<class Face, template<class> class FaceList, class PointField>
-        Xfer<cellList> extrudedCells
+        cellList extrudedCells
         (
             const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
             const extrudeModel&
@@ -87,10 +87,10 @@ class extrudedMesh
 
 
         //- Disallow default bitwise copy construct
-        extrudedMesh(const extrudedMesh&);
+        extrudedMesh(const extrudedMesh&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const extrudedMesh&);
+        void operator=(const extrudedMesh&) = delete;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMeshTemplates.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMeshTemplates.C
index 97befbd4dc..6cba917f6c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMeshTemplates.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMeshTemplates.C
@@ -34,7 +34,7 @@ template
     template<class> class FaceList,
     class PointField
 >
-Foam::Xfer<Foam::pointField> Foam::extrudedMesh::extrudedPoints
+Foam::pointField Foam::extrudedMesh::extrudedPoints
 (
     const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
     const extrudeModel& model
@@ -47,9 +47,9 @@ Foam::Xfer<Foam::pointField> Foam::extrudedMesh::extrudedPoints
 
     pointField ePoints((nLayers + 1)*surfacePoints.size());
 
-    for (label layer=0; layer<=nLayers; layer++)
+    for (label layer=0; layer <= nLayers; ++layer)
     {
-        label offset = layer*surfacePoints.size();
+        const label offset = layer*surfacePoints.size();
 
         forAll(surfacePoints, i)
         {
@@ -62,13 +62,12 @@ Foam::Xfer<Foam::pointField> Foam::extrudedMesh::extrudedPoints
         }
     }
 
-    // return points for transferring
-    return xferMove(ePoints);
+    return ePoints;
 }
 
 
 template<class Face, template<class> class FaceList, class PointField>
-Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
+Foam::faceList Foam::extrudedMesh::extrudedFaces
 (
     const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
     const extrudeModel& model
@@ -188,13 +187,13 @@ Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
             );
     }
 
-    // return points for transferring
-    return xferMove(eFaces);
+
+    return eFaces;
 }
 
 
 template<class Face, template<class> class FaceList, class PointField>
-Foam::Xfer<Foam::cellList> Foam::extrudedMesh::extrudedCells
+Foam::cellList Foam::extrudedMesh::extrudedCells
 (
     const PrimitivePatch<Face, FaceList, PointField>& extrudePatch,
     const extrudeModel& model
@@ -295,8 +294,7 @@ Foam::Xfer<Foam::cellList> Foam::extrudedMesh::extrudedCells
         facei++;
     }
 
-    // return points for transferring
-    return xferMove(eCells);
+    return eCells;
 }
 
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 869d54d80a..0bc28d03a2 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1880,7 +1880,7 @@ int main(int argc, char *argv[])
             }
         }
     }
-    const primitiveFacePatch extrudePatch(zoneFaces.xfer(), mesh.points());
+    const primitiveFacePatch extrudePatch(std::move(zoneFaces), mesh.points());
 
 
     Pstream::listCombineGather(isInternal, orEqOp<bool>());
@@ -2405,10 +2405,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE,
             false
         ),
-        xferCopy(pointField()),
-        xferCopy(faceList()),
-        xferCopy(labelList()),
-        xferCopy(labelList()),
+        Zero,
         false
     );
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
index dc6a68444f..894fdfe505 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
@@ -247,7 +247,7 @@ void Foam::patchToPoly2DMesh::addPatchFacesToOwner()
             << nExternalEdges << endl;
     }
 
-    owner_ = newOwner.xfer();
+    owner_.transfer(newOwner);
 }
 
 
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 10fda1151c..470d0a3ae1 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -184,24 +184,21 @@ int main(int argc, char *argv[])
 
         poly2DMesh.createMesh();
 
-        mesh.reset
+        mesh = autoPtr<polyMesh>::New
         (
-            new polyMesh
+            IOobject
             (
-                IOobject
-                (
-                    polyMesh::defaultRegion,
-                    runTimeExtruded.constant(),
-                    runTimeExtruded,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                xferMove(poly2DMesh.points()),
-                xferMove(poly2DMesh.faces()),
-                xferMove(poly2DMesh.owner()),
-                xferMove(poly2DMesh.neighbour())
-            )
+                polyMesh::defaultRegion,
+                runTimeExtruded.constant(),
+                runTimeExtruded,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            std::move(poly2DMesh.points()),
+            std::move(poly2DMesh.faces()),
+            std::move(poly2DMesh.owner()),
+            std::move(poly2DMesh.neighbour())
         );
 
         Info<< "Constructing patches." << endl;
@@ -224,17 +221,14 @@ int main(int argc, char *argv[])
     }
     else if (surfaceFormat == POLYMESH2D)
     {
-        mesh.reset
+        mesh = autoPtr<polyMesh>::New
         (
-            new polyMesh
+            Foam::IOobject
             (
-                Foam::IOobject
-                (
-                    Foam::polyMesh::defaultRegion,
-                    runTimeExtruded.timeName(),
-                    runTimeExtruded,
-                    Foam::IOobject::MUST_READ
-                )
+                Foam::polyMesh::defaultRegion,
+                runTimeExtruded.timeName(),
+                runTimeExtruded,
+                Foam::IOobject::MUST_READ
             )
         );
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index 8f57ee2bbf..a763b1b613 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -141,14 +141,11 @@ autoPtr<mapDistribute> buildMap
 
     List<Map<label>> compactMap;
 
-    return autoPtr<mapDistribute>
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            globalIndexing,
-            pointPoints,
-            compactMap
-        )
+        globalIndexing,
+        pointPoints,
+        compactMap
     );
 }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 5a4b0bafde..477b2442e8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -593,23 +593,20 @@ Foam::DelaunayMesh<Triangulation>::createMesh
 
     Info<< "Creating mesh" << endl;
 
-    autoPtr<polyMesh> meshPtr
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                name,
-                time().timeName(),
-                time(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            xferMove(points),
-            xferMove(faces),
-            xferMove(owner),
-            xferMove(neighbour)
-        )
+            name,
+            time().timeName(),
+            time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        std::move(points),
+        std::move(faces),
+        std::move(owner),
+        std::move(neighbour)
     );
 
     Info<< "Adding patches" << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index c053ce9e7b..620bd04dec 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -105,14 +105,11 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            constructSize,
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        constructSize,
+        std::move(sendMap),
+        std::move(constructMap)
     );
 }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 210d027fe6..d76f0a2406 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -36,9 +36,7 @@ License
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(backgroundMeshDecomposition, 0);
-
+    defineTypeNameAndDebug(backgroundMeshDecomposition, 0);
 }
 
 
@@ -114,14 +112,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            constructSize,
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        constructSize,
+        std::move(sendMap),
+        std::move(constructMap)
     );
 }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 97e0760557..dd4ab67eef 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -727,23 +727,20 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
     labelList cellToDelaunayVertex(removeUnusedCells(owner, neighbour));
     cellCentres = pointField(cellCentres, cellToDelaunayVertex);
 
-    autoPtr<polyMesh> meshPtr
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                "foamyHexMesh_temporary",
-                runTime_.timeName(),
-                runTime_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            xferCopy(pts),
-            xferMove(faces),
-            xferMove(owner),
-            xferMove(neighbour)
-        )
+            "foamyHexMesh_temporary",
+            runTime_.timeName(),
+            runTime_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        pointField(pts),  // Copy of points
+        std::move(faces),
+        std::move(owner),
+        std::move(neighbour)
     );
 
     polyMesh& pMesh = meshPtr();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index cbfa624275..c9732eb44d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -404,16 +404,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
     const PtrList<dictionary>& patchDicts
 ) const
 {
-    autoPtr<fvMesh> meshPtr
-    (
-        new fvMesh
-        (
-            io,
-            xferCopy(pointField()),
-            xferCopy(faceList()),
-            xferCopy(cellList())
-        )
-    );
+    auto meshPtr = autoPtr<fvMesh>::New(io, Zero);
     fvMesh& mesh = meshPtr();
 
     List<polyPatch*> patches(patchDicts.size());
@@ -827,10 +818,10 @@ void Foam::conformalVoronoiMesh::writeMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        xferMove(points),
-        xferMove(faces),
-        xferMove(owner),
-        xferMove(neighbour)
+        std::move(points),
+        std::move(faces),
+        std::move(owner),
+        std::move(neighbour)
     );
 
     Info<< indent << "Adding patches to mesh" << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 4f34c66bdb..0f07a35197 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -282,20 +282,17 @@ autoPtr<polyMesh> generateHexMesh
     word defaultFacesType = polyPatch::typeName;
     wordList patchPhysicalTypes(0);
 
-    return autoPtr<polyMesh>
+    return autoPtr<polyMesh>::New
     (
-        new polyMesh
-        (
-            io,
-            xferMoveTo<pointField>(points),
-            cellShapes,
-            boundary,
-            patchNames,
-            patchTypes,
-            defaultFacesName,
-            defaultFacesType,
-            patchPhysicalTypes
-        )
+        io,
+        std::move(points),
+        cellShapes,
+        boundary,
+        patchNames,
+        patchTypes,
+        defaultFacesName,
+        defaultFacesType,
+        patchPhysicalTypes
     );
 }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index c703564217..86a394271a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -152,10 +152,10 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE,
             false
         ),
-        xferMove(poly2DMesh.points()),
-        xferMove(poly2DMesh.faces()),
-        xferMove(poly2DMesh.owner()),
-        xferMove(poly2DMesh.neighbour())
+        std::move(poly2DMesh.points()),
+        std::move(poly2DMesh.faces()),
+        std::move(poly2DMesh.owner()),
+        std::move(poly2DMesh.neighbour())
     );
 
     Info<< "Constructing patches." << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 1e198578e9..69adb1c72c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -204,7 +204,7 @@ Foam::shortEdgeFilter2D::shortEdgeFilter2D
 
     points2D.clear();
 
-    ms_ = MeshedSurface<face>(xferMove(points), xferMove(faces));
+    ms_ = MeshedSurface<face>(std::move(points), std::move(faces));
 
     Info<< "Meshed surface stats before edge filtering :" << endl;
     ms_.writeStats(Info);
@@ -533,12 +533,7 @@ Foam::shortEdgeFilter2D::filter()
 
     newFaces.setSize(newFacei);
 
-    MeshedSurface<face> fMesh
-    (
-        xferMove(newPoints),
-        xferMove(newFaces),
-        xferCopy(List<surfZone>())
-    );
+    MeshedSurface<face> fMesh(std::move(newPoints), std::move(newFaces));
 
     updateEdgeRegionMap
     (
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 4b4b469015..0481aad8a3 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -476,7 +476,7 @@ void extractSurface
 
     // Gather all ZoneIDs
     List<labelList> gatheredZones(Pstream::nProcs());
-    gatheredZones[Pstream::myProcNo()] = compactZones.xfer();
+    gatheredZones[Pstream::myProcNo()].transfer(compactZones);
     Pstream::gatherList(gatheredZones);
 
     // On master combine all points, faces, zones
@@ -515,10 +515,10 @@ void extractSurface
 
         UnsortedMeshedSurface<face> unsortedFace
         (
-            xferMove(allPoints),
-            xferMove(allFaces),
-            xferMove(allZones),
-            xferMove(surfZones)
+            std::move(allPoints),
+            std::move(allFaces),
+            std::move(allZones),
+            surfZones
         );
 
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index 225d71e726..4b33a7ad8c 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -353,12 +353,12 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     Info<< "Mirroring cell shapes." << endl;
 
     Info<< nl << "Creating new mesh" << endl;
-    mirrorMeshPtr_ = new fvMesh
+    mirrorMeshPtr_ = autoPtr<fvMesh>::New
     (
         io,
-        xferMove(newPoints),
-        xferMove(newFaces),
-        xferMove(newCells)
+        std::move(newPoints),
+        std::move(newFaces),
+        std::move(newCells)
     );
 
     fvMesh& pMesh = *mirrorMeshPtr_;
@@ -381,10 +381,4 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::mirrorFvMesh::~mirrorFvMesh()
-{}
-
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
index bb11686653..99794622ad 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
@@ -55,21 +55,20 @@ class mirrorFvMesh
         IOdictionary mirrorMeshDict_;
 
         //- Mirrored mesh
-        fvMesh* mirrorMeshPtr_;
+        autoPtr<fvMesh> mirrorMeshPtr_;
 
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        mirrorFvMesh(const mirrorFvMesh&);
+        //- Disallow copy construct
+        mirrorFvMesh(const mirrorFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const mirrorFvMesh&);
+        //- Disallow copy assignment
+        void operator=(const mirrorFvMesh&) = delete;
 
 
 public:
 
-
     // Constructors
 
         //- Construct from IOobject
@@ -77,7 +76,7 @@ public:
 
 
     //- Destructor
-    ~mirrorFvMesh();
+    ~mirrorFvMesh() = default;
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 5f176118c4..1974ed569c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -461,10 +461,10 @@ autoPtr<mapPolyMesh> reorderMesh
 
     mesh.resetPrimitives
     (
-        Xfer<pointField>::null(),
-        xferMove(newFaces),
-        xferMove(newOwner),
-        xferMove(newNeighbour),
+        autoPtr<pointField>(),  // <- null: leaves points untouched
+        autoPtr<faceList>::New(std::move(newFaces)),
+        autoPtr<labelList>::New(std::move(newOwner)),
+        autoPtr<labelList>::New(std::move(newNeighbour)),
         patchSizes,
         patchStarts,
         true
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 437df9614c..09cdc1e212 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
             (
                 cutZoneName,
                 true // verbose
-            ).resetAddressing(faceIds.xfer(), false);
+            ).resetAddressing(std::move(faceIds), false);
 
 
             // Add the perfect interface mesh modifier
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
             (
                 mergePatchName + "MasterZone",
                 true // verbose
-            ).resetAddressing(faceIds.xfer(), false);
+            ).resetAddressing(std::move(faceIds), false);
 
             // Markup slave face ids
             faceIds.setSize(slavePatch.size());
@@ -561,7 +561,7 @@ int main(int argc, char *argv[])
             (
                 mergePatchName + "SlaveZone",
                 true // verbose
-            ).resetAddressing(faceIds.xfer(), false);
+            ).resetAddressing(std::move(faceIds), false);
 
             // Add empty zone for cut faces
             mesh.faceZones()
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 743ec98a78..185a8bbbd5 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -340,38 +340,32 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                 curPointLabels
             );
 
-            procMeshPtr.reset
+            procMeshPtr = autoPtr<polyMesh>::New
             (
-                new polyMesh
+                IOobject
                 (
-                    IOobject
-                    (
-                        this->polyMesh::name(), // region of undecomposed mesh
-                        facesInstance(),
-                        processorDb
-                    ),
-                    xferMove(facesInstancePoints),
-                    xferMove(procFaces),
-                    xferMove(procCells)
-                )
+                    this->polyMesh::name(), // region of undecomposed mesh
+                    facesInstance(),
+                    processorDb
+                ),
+                std::move(facesInstancePoints),
+                std::move(procFaces),
+                std::move(procCells)
             );
         }
         else
         {
-            procMeshPtr.reset
+            procMeshPtr = autoPtr<polyMesh>::New
             (
-                new polyMesh
+                IOobject
                 (
-                    IOobject
-                    (
-                        this->polyMesh::name(), // region of undecomposed mesh
-                        facesInstance(),
-                        processorDb
-                    ),
-                    xferMove(procPoints),
-                    xferMove(procFaces),
-                    xferMove(procCells)
-                )
+                    this->polyMesh::name(), // region of undecomposed mesh
+                    facesInstance(),
+                    processorDb
+                ),
+                std::move(procPoints),
+                std::move(procFaces),
+                std::move(procCells)
             );
         }
         polyMesh& procMesh = procMeshPtr();
@@ -751,7 +745,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                     IOobject::NO_WRITE,
                     false
                 ),
-                xferMove(procPoints)
+                std::move(procPoints)
             );
             pointsInstancePoints.write();
         }
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 905d61f2d7..267dce6a9b 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -652,9 +652,7 @@ int main(int argc, char *argv[])
                             runTime,
                             IOobject::NO_READ
                         ),
-                        xferCopy(pointField()),
-                        xferCopy(faceList()),
-                        xferCopy(cellList())
+                        Zero
                     )
                 );
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
index db4582034b..5f5d1fc727 100644
--- a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
@@ -166,15 +166,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
         // Create dummy mesh. Only used on procs that don't have mesh.
         IOobject noReadIO(io);
         noReadIO.readOpt() = IOobject::NO_READ;
-        fvMesh dummyMesh
-        (
-            noReadIO,
-            xferCopy(pointField()),
-            xferCopy(faceList()),
-            xferCopy(labelList()),
-            xferCopy(labelList()),
-            false
-        );
+        fvMesh dummyMesh(noReadIO, Zero, false);
 
         // Add patches
         List<polyPatch*> patches(patchEntries.size());
@@ -261,8 +253,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
     // parallel
 
     //Pout<< "Reading mesh from " << io.objectPath() << endl;
-    autoPtr<fvMesh> meshPtr(new fvMesh(io));
-    fvMesh& mesh = meshPtr();
+    auto meshPtr = autoPtr<fvMesh>::New(io);
+    fvMesh& mesh = *meshPtr;
 
 
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
index b55b14d9e3..81d6872079 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
@@ -279,15 +279,11 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
     }
 
 
-    // Construct map
-    return autoPtr<mapDistributeBase>
+    return autoPtr<mapDistributeBase>::New
     (
-        new mapDistributeBase
-        (
-            constructSize,
-            subMap.xfer(),
-            constructMap.xfer()
-        )
+        constructSize,
+        std::move(subMap),
+        std::move(constructMap)
     );
 }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
index 2506db2e60..b2650ce1f3 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
@@ -125,7 +125,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields
                         IOobject::NO_WRITE,
                         false
                     ),
-                    xferMove<Field<Type>>(field)
+                    std::move(field)
                 ).write();
             }
         }
@@ -212,7 +212,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
                         IOobject::NO_WRITE,
                         false
                     ),
-                    xferMove<Field<Field<Type>>>(field)
+                    std::move(field)
                 ).write();
             }
         }
@@ -309,7 +309,7 @@ void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields
                         IOobject::NO_WRITE,
                         false
                     ),
-                    xferMove<Field<typename Container::value_type>>(field)
+                    std::move(field)
                 ).write();
             }
         }
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index ea1c13be71..baf3104190 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.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.
@@ -1353,10 +1353,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     //}
 
 
-    return autoPtr<mapDistributePolyMesh>
-    (
-        new mapDistributePolyMesh(map.xfer())
-    );
+    return autoPtr<mapDistributePolyMesh>::New(std::move(map));
 }
 
 
@@ -1407,7 +1404,7 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
 
     autoPtr<mapDistributePolyMesh> mapPtr;
 
-    if (baseMeshPtr.valid() && baseMeshPtr().nCells())    //baseMeshPtr.valid())
+    if (baseMeshPtr.valid() && baseMeshPtr().nCells())
     {
         const fvMesh& baseMesh = baseMeshPtr();
 
@@ -1417,8 +1414,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute cellMap
         (
             baseMesh.nCells(),
-            cellSubMap.xfer(),
-            cellAddressing.xfer()
+            std::move(cellSubMap),
+            std::move(cellAddressing)
         );
 
         labelListList faceSubMap(Pstream::nProcs());
@@ -1427,8 +1424,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute faceMap
         (
             baseMesh.nFaces(),
-            faceSubMap.xfer(),
-            faceAddressing.xfer(),
+            std::move(faceSubMap),
+            std::move(faceAddressing),
             false,          //subHasFlip
             true            //constructHasFlip
         );
@@ -1439,8 +1436,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute pointMap
         (
             baseMesh.nPoints(),
-            pointSubMap.xfer(),
-            pointAddressing.xfer()
+            std::move(pointSubMap),
+            std::move(pointAddressing)
         );
 
         labelListList patchSubMap(Pstream::nProcs());
@@ -1451,8 +1448,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute patchMap
         (
             baseMesh.boundaryMesh().size(),
-            patchSubMap.xfer(),
-            boundaryAddressing.xfer()
+            std::move(patchSubMap),
+            std::move(boundaryAddressing)
         );
 
         const label nOldPoints = mesh.nPoints();
@@ -1475,12 +1472,12 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
                 nOldPoints,
                 nOldFaces,
                 nOldCells,
-                oldPatchStarts.xfer(),
-                oldPatchNMeshPoints.xfer(),
-                pointMap.xfer(),
-                faceMap.xfer(),
-                cellMap.xfer(),
-                patchMap.xfer()
+                std::move(oldPatchStarts),
+                std::move(oldPatchNMeshPoints),
+                std::move(pointMap),
+                std::move(faceMap),
+                std::move(cellMap),
+                std::move(patchMap)
             )
         );
     }
@@ -1493,8 +1490,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute cellMap
         (
             0,
-            cellSubMap.xfer(),
-            cellConstructMap.xfer()
+            std::move(cellSubMap),
+            std::move(cellConstructMap)
         );
 
         labelListList faceSubMap(Pstream::nProcs());
@@ -1504,8 +1501,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute faceMap
         (
             0,
-            faceSubMap.xfer(),
-            faceConstructMap.xfer(),
+            std::move(faceSubMap),
+            std::move(faceConstructMap),
             false,          //subHasFlip
             true            //constructHasFlip
         );
@@ -1517,8 +1514,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute pointMap
         (
             0,
-            pointSubMap.xfer(),
-            pointConstructMap.xfer()
+            std::move(pointSubMap),
+            std::move(pointConstructMap)
         );
 
         labelListList patchSubMap(Pstream::nProcs());
@@ -1530,8 +1527,8 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
         mapDistribute patchMap
         (
             0,
-            patchSubMap.xfer(),
-            patchConstructMap.xfer()
+            std::move(patchSubMap),
+            std::move(patchConstructMap)
         );
 
         const label nOldPoints = mesh.nPoints();
@@ -1554,12 +1551,12 @@ autoPtr<mapDistributePolyMesh> createReconstructMap
                 nOldPoints,
                 nOldFaces,
                 nOldCells,
-                oldPatchStarts.xfer(),
-                oldPatchNMeshPoints.xfer(),
-                pointMap.xfer(),
-                faceMap.xfer(),
-                cellMap.xfer(),
-                patchMap.xfer()
+                std::move(oldPatchStarts),
+                std::move(oldPatchNMeshPoints),
+                std::move(pointMap),
+                std::move(faceMap),
+                std::move(cellMap),
+                std::move(patchMap)
             )
         );
     }
@@ -1587,7 +1584,6 @@ void readProcAddressing
     //{
     //    Pout<< "Reading addressing from " << io.name() << " at "
     //        << mesh.facesInstance() << nl << endl;
-    //    distMap.clear();
     //    distMap.reset(new IOmapDistributePolyMesh(io));
     //}
     //else
@@ -1604,7 +1600,7 @@ void readProcAddressing
                 mesh,
                 IOobject::READ_IF_PRESENT
             ),
-            labelList(0)
+            labelList()
         );
         labelIOList faceProcAddressing
         (
@@ -1616,7 +1612,7 @@ void readProcAddressing
                 mesh,
                 IOobject::READ_IF_PRESENT
             ),
-            labelList(0)
+            labelList()
         );
         labelIOList pointProcAddressing
         (
@@ -1628,7 +1624,7 @@ void readProcAddressing
                 mesh,
                 IOobject::READ_IF_PRESENT
             ),
-            labelList(0)
+            labelList()
         );
         labelIOList boundaryProcAddressing
         (
@@ -1640,7 +1636,7 @@ void readProcAddressing
                 mesh,
                 IOobject::READ_IF_PRESENT
             ),
-            labelList(0)
+            labelList()
         );
 
 
@@ -2580,7 +2576,7 @@ int main(int argc, char *argv[])
                         runTime,
                         IOobject::READ_IF_PRESENT
                     ),
-                    labelList(0)
+                    labelList()
                 );
                 if
                 (
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index 18e10d75be..8ac395f249 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
@@ -49,7 +49,7 @@ Foam::tmp<Foam::Field<Type>> Foam::readParticleField
     if (obj != nullptr)
     {
         IOField<Type> newField(*obj);
-        return tmp<Field<Type>>::New(newField.xfer());
+        return tmp<Field<Type>>::New(std::move(newField));
     }
 
     FatalErrorInFunction
@@ -77,7 +77,7 @@ void Foam::readFields
         {
             Info<< "        reading field " << fieldNames[j] << endl;
             IOField<Type> newField(*obj);
-            values.set(j, new List<Type>(newField.xfer()));
+            values.set(j, new List<Type>(std::move(newField)));
         }
         else
         {
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index e21ca9b857..40132f1344 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE,
             false
         ),
-        globalFaceFaces
+        std::move(globalFaceFaces)
     );
     IOglobalFaceFaces.write();
 
@@ -881,7 +881,7 @@ int main(int argc, char *argv[])
             IOobject::NO_WRITE,
             false
         ),
-        visibleFaceFaces
+        std::move(visibleFaceFaces)
     );
     IOvisibleFaceFaces.write();
 
@@ -895,7 +895,7 @@ int main(int argc, char *argv[])
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        map.xfer()
+        std::move(map)
     );
 
     IOmapDist.write();
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 26f42d62b0..69637b46e5 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        surf.xfer()
+        std::move(surf)
     );
 
 
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index d1b0a4425f..86f35516b1 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -364,7 +364,7 @@ int main(int argc, char *argv[])
 
         // Gather all ZoneIDs
         List<labelList> gatheredZones(Pstream::nProcs());
-        gatheredZones[Pstream::myProcNo()] = compactZones.xfer();
+        gatheredZones[Pstream::myProcNo()].transfer(compactZones);
         Pstream::gatherList(gatheredZones);
 
         // On master combine all points, faces, zones
@@ -404,10 +404,10 @@ int main(int argc, char *argv[])
 
             UnsortedMeshedSurface<face> unsortedFace
             (
-                xferMove(allPoints),
-                xferMove(allFaces),
-                xferMove(allZones),
-                xferMove(surfZones)
+                std::move(allPoints),
+                std::move(allFaces),
+                std::move(allZones),
+                surfZones
             );
 
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
index a1b7c17cca..607b821121 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
@@ -80,7 +80,7 @@ void Foam::searchableSurfaceModifiers::cut::triangulate
             patchI
         );
     }
-    cutSurf = triSurface(tris.xfer(), patches, pts.xfer());
+    cutSurf = triSurface(tris, patches, pts, true);
 }
 
 
@@ -331,12 +331,12 @@ bool Foam::searchableSurfaceModifiers::cut::modify
             {
                 if (volTypes[i] == volumeType::INSIDE)
                 {
-                    nInside++;
+                    ++nInside;
                 }
             }
 
             // Add a patch for inside the box
-            if (nInside > 0 && surf3.patches().size() > 0)
+            if (nInside && surf3.patches().size() > 0)
             {
                 geometricSurfacePatchList newPatches(surf3.patches());
                 label sz = newPatches.size();
@@ -362,7 +362,7 @@ bool Foam::searchableSurfaceModifiers::cut::modify
                     }
                 }
                 pointField newPoints(surf3.points());
-                surf = triSurface(newTris.xfer(), newPatches, newPoints.xfer());
+                surf = triSurface(newTris, newPatches, newPoints, true);
 
                 changed = true;
             }
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
index 6d6978b298..7a8810ded6 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
@@ -104,12 +104,12 @@ Foam::treeDataCell::treeDataCell
 (
     const bool cacheBb,
     const polyMesh& mesh,
-    const Xfer<labelList>& cellLabels,
+    labelList&& cellLabels,
     const polyMesh::cellDecomposition decompMode
 )
 :
     mesh_(mesh),
-    cellLabels_(cellLabels),
+    cellLabels_(std::move(cellLabels)),
     cacheBb_(cacheBb),
     decompMode_(decompMode)
 {
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
index b53bb6fcd1..24a44fa99e 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
@@ -137,21 +137,21 @@ public:
 
     // Constructors
 
-        //- Construct from mesh and subset of cells.
+        //- Construct from mesh, copying subset of cells.
         treeDataCell
         (
             const bool cacheBb,
-            const polyMesh&,
-            const labelUList&,
+            const polyMesh& mesh,
+            const labelUList& cellLabels,
             const polyMesh::cellDecomposition decompMode
         );
 
-        //- Construct from mesh and subset of cells, transferring contents
+        //- Construct from mesh, moving subset of cells
         treeDataCell
         (
             const bool cacheBb,
-            const polyMesh&,
-            const Xfer<labelList>&,
+            const polyMesh& mesh,
+            labelList&& cellLabels,
             const polyMesh::cellDecomposition decompMode
         );
 
@@ -159,7 +159,7 @@ public:
         treeDataCell
         (
             const bool cacheBb,
-            const polyMesh&,
+            const polyMesh& mesh,
             const polyMesh::cellDecomposition decompMode
         );
 
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 371a64b5ba..12e86bad52 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -73,7 +73,7 @@ public:
         (
             const UList<T>& posList,
             const UList<T>& negList,
-            const Xfer<List<label>>& addr
+            List<label>&& addr
         );
 
 
@@ -99,9 +99,11 @@ public:
 
         // Edit
 
-            //- Reset addressing
+            //- Copy reset addressing
             inline void resetAddressing(const labelUList& addr);
-            inline void resetAddressing(const Xfer<List<label>>& addr);
+
+            //- Move reset addressing
+            inline void resetAddressing(List<label>&& addr);
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index 6b8a6c0b92..018bc1be33 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -60,12 +60,12 @@ inline Foam::BiIndirectList<T>::BiIndirectList
 (
     const UList<T>& posList,
     const UList<T>& negList,
-    const Xfer<List<label>>& addr
+    List<label>&& addr
 )
 :
     posList_(const_cast<UList<T>&>(posList)),
     negList_(const_cast<UList<T>&>(negList)),
-    addressing_(addr)
+    addressing_(std::move(addr))
 {}
 
 
@@ -120,10 +120,10 @@ inline void Foam::BiIndirectList<T>::resetAddressing
 template<class T>
 inline void Foam::BiIndirectList<T>::resetAddressing
 (
-    const Xfer<List<label>>& addr
+    List<label>&& addr
 )
 {
-    addressing_.transfer(addr());
+    addressing_.transfer(addr);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 2532ac7e4a..f1f0798516 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -99,16 +99,6 @@ Foam::CompactListList<T, Container>::CompactListList
 }
 
 
-template<class T, class Container>
-Foam::CompactListList<T, Container>::CompactListList
-(
-    const Xfer<CompactListList<T, Container>>& lst
-)
-{
-    transfer(lst());
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class Container>
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 5c1115e5af..473ce202cf 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -125,9 +125,6 @@ public:
         //- Move construct
         inline CompactListList(CompactListList<T, Container>&& lst);
 
-        //- Construct by transferring the parameter contents
-        explicit CompactListList(const Xfer<CompactListList<T, Container>>&);
-
         //- Construct as copy or re-use as specified.
         inline CompactListList(CompactListList<T, Container>& lst, bool reuse);
 
@@ -202,9 +199,6 @@ public:
             //  into this CompactListList and annul the argument list.
             void transfer(CompactListList<T, Container>& lst);
 
-            //- Transfer the contents to the Xfer container
-            inline Xfer<CompactListList<T, Container>> xfer();
-
 
         // Other
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 3f3cc4b622..055dadd11b 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -196,14 +196,6 @@ inline Foam::label Foam::CompactListList<T, Container>::whichColumn
 }
 
 
-template<class T, class Container>
-inline Foam::Xfer<Foam::CompactListList<T, Container>>
-Foam::CompactListList<T, Container>::xfer()
-{
-    return xferMove(*this);
-}
-
-
 template<class T, class Container>
 inline void Foam::CompactListList<T, Container>::resize(const label mRows)
 {
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 002a3e9227..bc16f090aa 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -152,9 +152,6 @@ public:
         //- Construct from UIndirectList. Size set to UIndirectList size.
         explicit inline DynamicList(const UIndirectList<T>& lst);
 
-        //- Transfer (move) construct
-        explicit inline DynamicList(const Xfer<List<T>>& lst);
-
         //- Move construct.
         inline DynamicList(DynamicList<T, SizeMin>&& lst);
 
@@ -242,10 +239,6 @@ public:
             //- Transfer contents  of the argument SortableList into this.
             inline void transfer(SortableList<T>& lst);
 
-            //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T>> xfer();
-
-
             //- Append an element to the end of this list.
             inline DynamicList<T, SizeMin>& append(const T& val);
 
@@ -375,6 +368,7 @@ public:
                 Istream& is,
                 DynamicList<T, SizeMin>& lst
             );
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index ed2b0b6b84..b383da6896 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -177,17 +177,6 @@ inline Foam::DynamicList<T, SizeMin>::DynamicList
 {}
 
 
-template<class T, int SizeMin>
-inline Foam::DynamicList<T, SizeMin>::DynamicList
-(
-    const Xfer<List<T>>& lst
-)
-:
-    List<T>(lst),
-    capacity_(List<T>::size())
-{}
-
-
 template<class T, int SizeMin>
 inline Foam::DynamicList<T, SizeMin>::DynamicList
 (
@@ -470,14 +459,6 @@ Foam::DynamicList<T, SizeMin>::transfer
 }
 
 
-template<class T, int SizeMin>
-inline Foam::Xfer<Foam::List<T>>
-Foam::DynamicList<T, SizeMin>::xfer()
-{
-    return xferMoveTo<List<T>>(*this);
-}
-
-
 template<class T, int SizeMin>
 inline Foam::DynamicList<T, SizeMin>&
 Foam::DynamicList<T, SizeMin>::append
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 84a35f8146..1422a03674 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -76,7 +76,7 @@ protected:
         explicit inline IndirectListAddressing(const labelUList& addr);
 
         //- Construct by transferring addressing array
-        explicit inline IndirectListAddressing(const Xfer<List<label>>& addr);
+        explicit inline IndirectListAddressing(List<label>&& addr);
 
 
     // Member Functions
@@ -84,9 +84,11 @@ protected:
         //- Return the list addressing
         inline const List<label>& addressing() const;
 
-        //- Reset addressing
+        //- Copy reset addressing
         inline void resetAddressing(const labelUList& addr);
-        inline void resetAddressing(const Xfer<List<label>>& addr);
+
+        //- Move reset addressing
+        inline void resetAddressing(List<label>&& addr);
 
 };
 
@@ -125,7 +127,7 @@ public:
         inline IndirectList
         (
             const UList<T>& completeList,
-            const Xfer<List<label>>& addr
+            List<label>&& addr
         );
 
         //- Copy constructor
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index 1558c3a661..27eb6ced04 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -36,10 +36,10 @@ inline Foam::IndirectListAddressing::IndirectListAddressing
 
 inline Foam::IndirectListAddressing::IndirectListAddressing
 (
-    const Xfer<List<label>>& addr
+    List<label>&& addr
 )
 :
-    addressing_(addr)
+    addressing_(std::move(addr))
 {}
 
 
@@ -63,10 +63,10 @@ template<class T>
 inline Foam::IndirectList<T>::IndirectList
 (
     const UList<T>& completeList,
-    const Xfer<List<label>>& addr
+    List<label>&& addr
 )
 :
-    IndirectListAddressing(addr),
+    IndirectListAddressing(std::move(addr)),
     UIndirectList<T>
     (
         completeList,
@@ -125,10 +125,10 @@ inline void Foam::IndirectListAddressing::resetAddressing
 
 inline void Foam::IndirectListAddressing::resetAddressing
 (
-    const Xfer<List<label>>& addr
+    List<label>&& addr
 )
 {
-    addressing_.transfer(addr());
+    addressing_.transfer(addr);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index d1660e0b4f..8897e32885 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -305,13 +305,6 @@ Foam::List<T>::List(std::initializer_list<T> lst)
 {}
 
 
-template<class T>
-Foam::List<T>::List(const Xfer<List<T>>& lst)
-{
-    transfer(lst());
-}
-
-
 template<class T>
 Foam::List<T>::List(List<T>&& lst)
 :
@@ -513,10 +506,13 @@ void Foam::List<T>::operator=(const SLList<T>& lst)
 
     if (len)
     {
+        List_ACCESS(T, (*this), vp);
+
         label i = 0;
         for (auto iter = lst.cbegin(); iter != lst.cend(); ++iter)
         {
-            this->operator[](i++) = *iter;
+            vp[i] = *iter;
+            ++i;
         }
     }
 }
@@ -617,9 +613,14 @@ void Foam::List<T>::operator=(SLList<T>&& lst)
 
     reAlloc(len);
 
-    for (label i = 0; i < len; ++i)
+    if (len)
     {
-        this->operator[](i) = std::move(lst.removeHead());
+        List_ACCESS(T, (*this), vp);
+
+        for (label i = 0; i < len; ++i)
+        {
+            vp[i] = std::move(lst.removeHead());
+        }
     }
 
     lst.clear();
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index d974d58e1c..fba0a559e5 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -43,7 +43,6 @@ SourceFiles
 #include "UList.H"
 #include "autoPtr.H"
 #include "one.H"
-#include "Xfer.H"
 #include "SLListFwd.H"
 
 #include <initializer_list>
@@ -173,9 +172,6 @@ public:
         //- Construct from an initializer list
         List(std::initializer_list<T> lst);
 
-        //- Transfer (move) construct
-        List(const Xfer<List<T>>& lst);
-
         //- Move construct from List
         List(List<T>&& lst);
 
@@ -250,9 +246,6 @@ public:
             //- and annul the argument list
             void transfer(SortableList<T>& lst);
 
-            //- Transfer contents to the Xfer container
-            inline Xfer<List<T>> xfer();
-
             //- Return subscript-checked element of UList and resizing the list
             //- if required.
             inline T& newElmt(const label i);
@@ -310,6 +303,7 @@ public:
             Istream& is,
             List<T>& L
         );
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 46e24e1d73..9579e3612d 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -149,13 +149,6 @@ inline T& Foam::List<T>::newElmt(const label i)
 }
 
 
-template<class T>
-inline Foam::Xfer<Foam::List<T>> Foam::List<T>::xfer()
-{
-    return xferMove(*this);
-}
-
-
 template<class T>
 inline void Foam::List<T>::append(const T& val)
 {
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index 329b87a118..a25776e029 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -57,13 +57,6 @@ Foam::PtrList<T>::PtrList(const PtrList<T>& lst, const CloneArg& cloneArg)
 }
 
 
-template<class T>
-Foam::PtrList<T>::PtrList(const Xfer<PtrList<T>>& lst)
-{
-    transfer(lst());
-}
-
-
 template<class T>
 Foam::PtrList<T>::PtrList(PtrList<T>& lst, bool reuse)
 :
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index c49f70846b..0a7e9d7e80 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -98,9 +98,6 @@ public:
         template<class CloneArg>
         PtrList(const PtrList<T>& lst, const CloneArg& cloneArg);
 
-        //- Construct by transferring the parameter contents
-        PtrList(const Xfer<PtrList<T>>& lst);
-
         //- Construct as copy or re-use as specified
         PtrList(PtrList<T>& lst, bool reuse);
 
@@ -144,9 +141,6 @@ public:
         //- Transfer into this list and annul the argument list
         inline void transfer(PtrList<T>& lst);
 
-        //- Transfer contents to the Xfer container
-        inline Xfer<PtrList<T>> xfer();
-
         //- Return true if element is set (ie, not a nullptr)
         inline bool set(const label i) const;
 
@@ -175,6 +169,7 @@ public:
 
         //- Read PtrList from Istream, discarding contents of existing PtrList
         friend Istream& operator>> <T>(Istream& is, PtrList<T>& lst);
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index 50885d572e..17019a1297 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -111,13 +111,6 @@ inline void Foam::PtrList<T>::transfer(PtrList<T>& lst)
 }
 
 
-template<class T>
-inline Foam::Xfer<Foam::PtrList<T>> Foam::PtrList<T>::xfer()
-{
-    return xferMove(*this);
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index 6d2d2698dc..139d5897bc 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
@@ -80,15 +80,6 @@ Foam::SortableList<T>::SortableList(List<T>&& values)
 }
 
 
-template<class T>
-Foam::SortableList<T>::SortableList(const Xfer<List<T>>& values)
-:
-    List<T>(values)
-{
-    sort();
-}
-
-
 template<class T>
 template<class InputIterator>
 inline Foam::SortableList<T>::SortableList
@@ -158,13 +149,6 @@ void Foam::SortableList<T>::swap(SortableList<T>& lst)
 }
 
 
-template<class T>
-Foam::Xfer<Foam::List<T>> Foam::SortableList<T>::xfer()
-{
-    return xferMoveTo<List<T>>(*this);
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
@@ -195,7 +179,7 @@ template<class T>
 inline void Foam::SortableList<T>::operator=(List<T>&& lst)
 {
     indices_.clear();
-    List<T>::operator=(std::move(lst));
+    List<T>::transfer(lst);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 083e69386f..99b1912170 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -95,9 +95,6 @@ public:
         //- Construct from an initializer list, sorting immediately
         SortableList(std::initializer_list<T> values);
 
-        //- Construct from transferred List, sorting immediately
-        explicit SortableList(const Xfer<List<T>>& values);
-
 
     // Member Functions
 
@@ -129,9 +126,6 @@ public:
         //- Swap content with another SortableList in constant time
         inline void swap(SortableList<T>& lst);
 
-        //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<T>> xfer();
-
 
     // Member Operators
 
@@ -152,6 +146,7 @@ public:
 
         //- Assignment to an initializer list
         void operator=(std::initializer_list<T> lst);
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index b23c6dbe1d..bd4f64ebdf 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -99,7 +99,7 @@ public:
         UPtrList() = default;
 
         //- Construct with specified size, each element initialized to nullptr
-        explicit inline UPtrList(const label nElem);
+        explicit inline UPtrList(const label len);
 
         //- Construct from PtrList, copying addresses of each list element.
         //  The argument is non-const access since this UPtrList can be used
@@ -109,9 +109,6 @@ public:
         //- Construct from UList, taking addresses of each list element
         explicit UPtrList(UList<T>& lst);
 
-        //- Construct by transferring the parameter contents
-        inline UPtrList(const Xfer<UPtrList<T>>& lst);
-
         //- Construct as copy or re-use as specified
         inline UPtrList(UPtrList<T>& lst, bool reuse);
 
@@ -167,9 +164,6 @@ public:
         //- Transfer contents into this list and annul the argument
         inline void transfer(UPtrList<T>& lst);
 
-        //- Transfer contents to the Xfer container
-        inline Xfer<UPtrList<T>> xfer();
-
         //- Return true if element is set (ie, not a nullptr)
         inline bool set(const label i) const;
 
@@ -326,6 +320,7 @@ public:
 
         //- Write UPtrList to Ostream
         friend Ostream& operator<< <T>(Ostream& os, const UPtrList<T>& lst);
+
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
index bfaa83917b..34cd46d015 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
@@ -26,9 +26,9 @@ License
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::UPtrList<T>::UPtrList(const label nElem)
+inline Foam::UPtrList<T>::UPtrList(const label len)
 :
-    ptrs_(nElem, reinterpret_cast<T*>(0))
+    ptrs_(len, reinterpret_cast<T*>(0))
 {}
 
 
@@ -46,13 +46,6 @@ inline Foam::UPtrList<T>::UPtrList(UPtrList<T>&& lst)
 {}
 
 
-template<class T>
-inline Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T>>& lst)
-{
-    transfer(lst());
-}
-
-
 template<class T>
 inline Foam::UPtrList<T>::UPtrList(UPtrList<T>& lst, bool reuse)
 :
@@ -175,13 +168,6 @@ inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
 }
 
 
-template<class T>
-inline Foam::Xfer<Foam::UPtrList<T>> Foam::UPtrList<T>::xfer()
-{
-    return xferMove(*this);
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
@@ -190,9 +176,8 @@ inline const T& Foam::UPtrList<T>::operator[](const label i) const
     if (!ptrs_[i])
     {
         FatalErrorInFunction
-            << "hanging pointer at index " << i
-            << " (size " << size()
-            << "), cannot dereference"
+            << "cannot dereference nullptr at index " << i
+            << " (size " << size() << ")"
             << abort(FatalError);
     }
 
@@ -206,9 +191,8 @@ inline T& Foam::UPtrList<T>::operator[](const label i)
     if (!ptrs_[i])
     {
         FatalErrorInFunction
-            << "hanging pointer at index " << i
-            << " (size " << size()
-            << "), cannot dereference"
+            << "cannot dereference nullptr at index " << i
+            << " (size " << size() << ")"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index ef8e34185a..8bbb2f6863 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -127,7 +127,7 @@ template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
     const IOobject& io,
-    const Field<T>& list
+    const UList<T>& content
 )
 :
     regIOobject(io)
@@ -142,7 +142,7 @@ Foam::CompactIOField<T, BaseType>::CompactIOField
     }
     else
     {
-        Field<T>::operator=(list);
+        Field<T>::operator=(content);
     }
 }
 
@@ -151,12 +151,12 @@ template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
     const IOobject& io,
-    const Xfer<Field<T>>& list
+    Field<T>&& content
 )
 :
     regIOobject(io)
 {
-    Field<T>::transfer(list());
+    Field<T>::transfer(content);
 
     if
     (
@@ -169,14 +169,6 @@ Foam::CompactIOField<T, BaseType>::CompactIOField
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T, class BaseType>
-Foam::CompactIOField<T, BaseType>::~CompactIOField()
-{}
-
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
@@ -191,21 +183,19 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
     if (fmt == IOstream::ASCII)
     {
         // Change type to be non-compact format type
-        const word oldTypeName = typeName;
+        const word oldTypeName(typeName);
 
         const_cast<word&>(typeName) = IOField<T>::typeName;
 
-        bool good = regIOobject::writeObject(fmt, ver, cmp, valid);
+        bool good = regIOobject::writeObject(IOstream::ASCII, ver, cmp, valid);
 
         // Change type back
         const_cast<word&>(typeName) = oldTypeName;
 
         return good;
     }
-    else
-    {
-        return regIOobject::writeObject(fmt, ver, cmp, valid);
-    }
+
+    return regIOobject::writeObject(fmt, ver, cmp, valid);
 }
 
 
@@ -228,13 +218,6 @@ void Foam::CompactIOField<T, BaseType>::operator=
 }
 
 
-template<class T, class BaseType>
-void Foam::CompactIOField<T, BaseType>::operator=(const Field<T>& rhs)
-{
-    Field<T>::operator=(rhs);
-}
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index 02fbedacc7..d9c528187d 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -47,7 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 template<class T, class BaseType> class CompactIOField;
 
 template<class T, class BaseType> Istream& operator>>
@@ -85,28 +85,30 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        CompactIOField(const CompactIOField&) = default;
+
         //- Construct from IOobject
-        CompactIOField(const IOobject&);
+        explicit CompactIOField(const IOobject& io);
 
         //- Construct from IOobject; does local processor require reading?
-        CompactIOField(const IOobject&, const bool valid);
+        CompactIOField(const IOobject& io, const bool valid);
 
         //- Construct from IOobject and size
-        CompactIOField(const IOobject&, const label);
+        CompactIOField(const IOobject& io, const label size);
 
-        //- Construct from IOobject and a Field
-        CompactIOField(const IOobject&, const Field<T>&);
+        //- Construct from IOobject and a List/Field content
+        CompactIOField(const IOobject& io, const UList<T>& content);
 
         //- Construct by transferring the Field contents
-        CompactIOField(const IOobject&, const Xfer<Field<T>>&);
+        CompactIOField(const IOobject& io, Field<T>&& content);
 
 
-    // Destructor
-
-        virtual ~CompactIOField();
+    //- Destructor
+    virtual ~CompactIOField() = default;
 
 
-    // Member functions
+    // Member Functions
 
         virtual bool writeObject
         (
@@ -116,14 +118,16 @@ public:
             const bool valid
         ) const;
 
-        virtual bool writeData(Ostream&) const;
+        virtual bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const CompactIOField<T, BaseType>&);
+        //- Copy assignment of entries
+        void operator=(const CompactIOField<T, BaseType>& rhs);
 
-        void operator=(const Field<T>&);
+        //- Copy or move assignment of entries
+        using Field<T>::operator=;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index 85aca2d9f7..8a0e2cacf1 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.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 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +61,7 @@ bool Foam::CompactIOList<T, BaseType>::overflows() const
     label size = 0;
     forAll(*this, i)
     {
-        label oldSize = size;
+        const label oldSize = size;
         size += this->operator[](i).size();
         if (size < oldSize)
         {
@@ -94,7 +94,7 @@ template<class T, class BaseType>
 Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
-    const label size
+    const label len
 )
 :
     regIOobject(io)
@@ -109,7 +109,7 @@ Foam::CompactIOList<T, BaseType>::CompactIOList
     }
     else
     {
-        List<T>::setSize(size);
+        List<T>::setSize(len);
     }
 }
 
@@ -118,7 +118,7 @@ template<class T, class BaseType>
 Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
-    const List<T>& list
+    const UList<T>& content
 )
 :
     regIOobject(io)
@@ -133,7 +133,7 @@ Foam::CompactIOList<T, BaseType>::CompactIOList
     }
     else
     {
-        List<T>::operator=(list);
+        List<T>::operator=(content);
     }
 }
 
@@ -142,12 +142,12 @@ template<class T, class BaseType>
 Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
-    const Xfer<List<T>>& list
+    List<T>&& content
 )
 :
     regIOobject(io)
 {
-    List<T>::transfer(list());
+    List<T>::transfer(content);
 
     if
     (
@@ -160,14 +160,6 @@ Foam::CompactIOList<T, BaseType>::CompactIOList
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T, class BaseType>
-Foam::CompactIOList<T, BaseType>::~CompactIOList()
-{}
-
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
@@ -233,13 +225,6 @@ void Foam::CompactIOList<T, BaseType>::operator=
 }
 
 
-template<class T, class BaseType>
-void Foam::CompactIOList<T, BaseType>::operator=(const List<T>& rhs)
-{
-    List<T>::operator=(rhs);
-}
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
@@ -293,7 +278,7 @@ Foam::Ostream& Foam::operator<<
         start[0] = 0;
         for (label i = 1; i < start.size(); i++)
         {
-            label prev = start[i-1];
+            const label prev = start[i-1];
             start[i] = prev+L[i-1].size();
 
             if (start[i] < prev)
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index 7843478451..2b97eff361 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +47,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declarations
 class Istream;
 class Ostream;
-
-// Forward declaration of friend functions and operators
 template<class T, class BaseType> class CompactIOList;
 
 template<class T, class BaseType> Istream& operator>>
@@ -90,25 +89,27 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        CompactIOList(const CompactIOList&) = default;
+
         //- Construct from IOobject
-        CompactIOList(const IOobject&);
+        explicit CompactIOList(const IOobject& io);
 
-        //- Construct from IOobject and size of CompactIOList
-        CompactIOList(const IOobject&, const label);
+        //- Construct from IOobject and default length of CompactIOList
+        CompactIOList(const IOobject& io, const label len);
 
-        //- Construct from IOobject and a List
-        CompactIOList(const IOobject&, const List<T>&);
-
-        //- Construct by transferring the List contents
-        CompactIOList(const IOobject&, const Xfer<List<T>>&);
+        //- Construct from IOobject and List content
+        CompactIOList(const IOobject& io, const UList<T>& content);
 
+        //- Construct by transferring the List content
+        CompactIOList(const IOobject& io, List<T>&& content);
 
     // Destructor
 
-        virtual ~CompactIOList();
+        virtual ~CompactIOList() = default;
 
 
-    // Member functions
+    // Member Functions
 
         virtual bool writeObject
         (
@@ -121,11 +122,13 @@ public:
         virtual bool writeData(Ostream&) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const CompactIOList<T, BaseType>&);
+        //- Copy assignment of entries
+        void operator=(const CompactIOList<T, BaseType>& rhs);
 
-        void operator=(const List<T>&);
+        //- Copy or move assignment of entries
+        using List<T>::operator=;
 
 
     // IOstream operators
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
index 3cb85ba18a..c1bf43baf3 100644
--- a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,7 +58,7 @@ template<class Type>
 Foam::GlobalIOField<Type>::GlobalIOField
 (
     const IOobject& io,
-    const Field<Type>& f
+    const UList<Type>& content
 )
 :
     regIOobject(io)
@@ -68,7 +68,7 @@ Foam::GlobalIOField<Type>::GlobalIOField
 
     if (!readHeaderOk(IOstream::BINARY, typeName))
     {
-        Field<Type>::operator=(f);
+        Field<Type>::operator=(content);
     }
 }
 
@@ -77,7 +77,7 @@ template<class Type>
 Foam::GlobalIOField<Type>::GlobalIOField
 (
     const IOobject& io,
-    const Xfer<Field<Type>>& f
+    Field<Type>&& content
 )
 :
     regIOobject(io)
@@ -85,17 +85,38 @@ Foam::GlobalIOField<Type>::GlobalIOField
     // Check for MUST_READ_IF_MODIFIED
     warnNoRereading<GlobalIOField<Type>>();
 
-    Field<Type>::transfer(f());
+    Field<Type>::transfer(content);
 
     readHeaderOk(IOstream::BINARY, typeName);
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
 template<class Type>
-Foam::GlobalIOField<Type>::~GlobalIOField()
-{}
+Foam::GlobalIOField<Type>::GlobalIOField
+(
+    const IOobject& io,
+    const tmp<Field<Type>>& tfld
+)
+:
+    regIOobject(io)
+{
+    // Check for MUST_READ_IF_MODIFIED
+    warnNoRereading<GlobalIOField<Type>>();
+
+    const bool reuse = tfld.movable();
+
+    if (reuse)
+    {
+        Field<Type>::transfer(tfld.ref());
+    }
+
+    if (!readHeaderOk(IOstream::BINARY, typeName))
+    {
+        Field<Type>::operator=(tfld());
+    }
+
+    tfld.clear();
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -124,11 +145,4 @@ void Foam::GlobalIOField<Type>::operator=(const GlobalIOField<Type>& rhs)
 }
 
 
-template<class Type>
-void Foam::GlobalIOField<Type>::operator=(const Field<Type>& rhs)
-{
-    Field<Type>::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
index f4b4124f87..bc01d334a6 100644
--- a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,24 +61,30 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        GlobalIOField(const GlobalIOField&) = default;
+
         //- Construct from IOobject
-        GlobalIOField(const IOobject&);
+        explicit GlobalIOField(const IOobject& io);
 
         //- Construct from IOobject and size (does not set values)
-        GlobalIOField(const IOobject&, const label size);
+        GlobalIOField(const IOobject& io, const label size);
 
-        //- Construct from components
-        GlobalIOField(const IOobject&, const Field<Type>&);
+        //- Construct from IOobject and a List/Field content
+        GlobalIOField(const IOobject& io, const UList<Type>& content);
 
-        //- Construct by transferring the Field contents
-        GlobalIOField(const IOobject&, const Xfer<Field<Type>>&);
+        //- Construct by transferring the Field content
+        GlobalIOField(const IOobject& io, Field<Type>&& content);
+
+        //- Construct by copying/moving tmp content
+        GlobalIOField(const IOobject& io, const tmp<Field<Type>>& tf);
 
 
     //- Destructor
-    virtual ~GlobalIOField();
+    virtual ~GlobalIOField() = default;
 
 
-    // Member functions
+    // Member Functions
 
         //- Is object global
         virtual bool global() const
@@ -87,24 +93,27 @@ public:
         }
 
         //- Return complete path + object name if the file exists
-        //  either in the case/processor or case otherwise null
+        //- either in the case/processor or case, otherwise null
         virtual fileName filePath() const
         {
             return globalFilePath(type());
         }
 
-        //- ReadData function required for regIOobject read operation
-        virtual bool readData(Istream&);
+        //- The readData method for regIOobject read operation
+        virtual bool readData(Istream& is);
 
-        //- WriteData function required for regIOobject write operation
-        bool writeData(Ostream&) const;
+        //- The writeData method for regIOobject write operation
+        bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const GlobalIOField<Type>&);
+        //- Copy assignment of entries
+        void operator=(const GlobalIOField<Type>& rhs);
+
+        //- Copy or move assignment of entries
+        using Field<Type>::operator=;
 
-        void operator=(const Field<Type>&);
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
index bad4fe1237..4c97bef70c 100644
--- a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +55,11 @@ Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const label size)
 
 
 template<class Type>
-Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const List<Type>& f)
+Foam::GlobalIOList<Type>::GlobalIOList
+(
+    const IOobject& io,
+    const UList<Type>& content
+)
 :
     regIOobject(io)
 {
@@ -64,7 +68,7 @@ Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const List<Type>& f)
 
     if (!readHeaderOk(IOstream::BINARY, typeName))
     {
-        List<Type>::operator=(f);
+        List<Type>::operator=(content);
     }
 }
 
@@ -73,7 +77,7 @@ template<class Type>
 Foam::GlobalIOList<Type>::GlobalIOList
 (
     const IOobject& io,
-    const Xfer<List<Type>>& f
+    List<Type>&& content
 )
 :
     regIOobject(io)
@@ -81,19 +85,12 @@ Foam::GlobalIOList<Type>::GlobalIOList
     // Check for MUST_READ_IF_MODIFIED
     warnNoRereading<GlobalIOList<Type>>();
 
-    List<Type>::transfer(f());
+    List<Type>::transfer(content);
 
     readHeaderOk(IOstream::BINARY, typeName);
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::GlobalIOList<Type>::~GlobalIOList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -120,11 +117,4 @@ void Foam::GlobalIOList<Type>::operator=(const GlobalIOList<Type>& rhs)
 }
 
 
-template<class Type>
-void Foam::GlobalIOList<Type>::operator=(const List<Type>& rhs)
-{
-    List<Type>::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
index 1f7cb9c466..ba4ef9a0d5 100644
--- a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
+++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,6 @@ class GlobalIOList
     public regIOobject,
     public List<Type>
 {
-
 public:
 
     TypeName("List");
@@ -61,24 +60,27 @@ public:
 
     // Constructors
 
-        //- Construct from IOobject
-        GlobalIOList(const IOobject&);
+        //- Default copy construct
+        GlobalIOList(const GlobalIOList&) = default;
 
         //- Construct from IOobject
-        GlobalIOList(const IOobject&, const label size);
+        explicit GlobalIOList(const IOobject& io);
+
+        //- Construct from IOobject
+        GlobalIOList(const IOobject& io, const label size);
 
         //- Construct from IOobject and a List
-        GlobalIOList(const IOobject&, const List<Type>&);
+        GlobalIOList(const IOobject& io, const UList<Type>& content);
 
-        //- Construct by transferring the List contents
-        GlobalIOList(const IOobject&, const Xfer<List<Type>>&);
+        //- Construct by transferring the List content
+        GlobalIOList(const IOobject& io, List<Type>&& content);
 
 
     //- Destructor
-    virtual ~GlobalIOList();
+    virtual ~GlobalIOList() = default;
 
 
-    // Member functions
+    // Member Functions
 
         //- Is object global
         virtual bool global() const
@@ -93,18 +95,20 @@ public:
             return globalFilePath(type());
         }
 
-        //- ReadData function required for regIOobject read operation
-        virtual bool readData(Istream&);
+        //- The readData method for regIOobject read operation
+        virtual bool readData(Istream& is);
 
-        //- WriteData function required for regIOobject write operation
-        bool writeData(Ostream&) const;
+        //- The writeData method for regIOobject write operation
+        bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const GlobalIOList<Type>&);
+        //- Copy assignment of entries
+        void operator=(const GlobalIOList<Type>& rhs);
 
-        void operator=(const List<Type>&);
+        //- Copy or move assignment of entries
+        using List<Type>::operator=;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 41d386e2d5..53d0f6bd26 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.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) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -115,7 +115,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const label size)
 
 
 template<class Type>
-Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
+Foam::IOField<Type>::IOField(const IOobject& io, const UList<Type>& content)
 :
     regIOobject(io)
 {
@@ -136,20 +136,20 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
     }
     else
     {
-        Field<Type>::operator=(f);
+        Field<Type>::operator=(content);
     }
 }
 
 
 template<class Type>
-Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
+Foam::IOField<Type>::IOField(const IOobject& io, Field<Type>&& content)
 :
     regIOobject(io)
 {
     // Check for MUST_READ_IF_MODIFIED
     warnNoRereading<IOField<Type>>();
 
-    Field<Type>::transfer(f());
+    Field<Type>::transfer(content);
 
     if
     (
@@ -166,11 +166,38 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
 template<class Type>
-Foam::IOField<Type>::~IOField()
-{}
+Foam::IOField<Type>::IOField(const IOobject& io, const tmp<Field<Type>>& tfld)
+:
+    regIOobject(io)
+{
+    const bool reuse = tfld.movable();
+
+    if (reuse)
+    {
+        Field<Type>::transfer(tfld.ref());
+    }
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+    else if (!reuse)
+    {
+        Field<Type>::operator=(tfld());
+    }
+
+    tfld.clear();
+}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -190,11 +217,4 @@ void Foam::IOField<Type>::operator=(const IOField<Type>& rhs)
 }
 
 
-template<class Type>
-void Foam::IOField<Type>::operator=(const Field<Type>& rhs)
-{
-    Field<Type>::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index 768c8b05ea..ee856cb0b4 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,6 @@ class IOField
     public regIOobject,
     public Field<Type>
 {
-
 public:
 
     TypeName("Field");
@@ -61,36 +60,44 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOField(const IOField&) = default;
+
         //- Construct from IOobject
-        IOField(const IOobject&);
+        explicit IOField(const IOobject& io);
 
         //- Construct from IOobject; does local processor require reading?
-        IOField(const IOobject&, const bool valid);
+        IOField(const IOobject& io, const bool valid);
 
         //- Construct from IOobject and size (does not set values)
-        IOField(const IOobject&, const label size);
+        IOField(const IOobject& io, const label size);
 
-        //- Construct from components
-        IOField(const IOobject&, const Field<Type>&);
+        //- Construct from IOobject and a List/Field content
+        IOField(const IOobject& io, const UList<Type>& content);
 
-        //- Construct by transferring the Field contents
-        IOField(const IOobject&, const Xfer<Field<Type>>&);
+        //- Construct by transferring the Field content
+        IOField(const IOobject& io, Field<Type>&& content);
+
+        //- Construct by copying/moving tmp content
+        IOField(const IOobject& io, const tmp<Field<Type>>& tfld);
 
 
     //- Destructor
-    virtual ~IOField();
+    virtual ~IOField() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        bool writeData(Ostream&) const;
+        bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const IOField<Type>&);
+        //- Copy assignment of entries
+        void operator=(const IOField<Type>& rhs);
 
-        void operator=(const Field<Type>&);
+        //- Copy or move assignment of entries
+        using Field<Type>::operator=;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 3859e4de04..baf664e304 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,7 @@ Foam::IOList<T>::IOList(const IOobject& io)
 
 
 template<class T>
-Foam::IOList<T>::IOList(const IOobject& io, const label size)
+Foam::IOList<T>::IOList(const IOobject& io, const label len)
 :
     regIOobject(io)
 {
@@ -72,13 +72,13 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
     }
     else
     {
-        List<T>::setSize(size);
+        List<T>::setSize(len);
     }
 }
 
 
 template<class T>
-Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
+Foam::IOList<T>::IOList(const IOobject& io, const UList<T>& content)
 :
     regIOobject(io)
 {
@@ -99,20 +99,20 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
     }
     else
     {
-        List<T>::operator=(list);
+        List<T>::operator=(content);
     }
 }
 
 
 template<class T>
-Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
+Foam::IOList<T>::IOList(const IOobject& io, List<T>&& content)
 :
     regIOobject(io)
 {
     // Check for MUST_READ_IF_MODIFIED
     warnNoRereading<IOList<T>>();
 
-    List<T>::transfer(list());
+    List<T>::transfer(content);
 
     if
     (
@@ -129,13 +129,6 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOList<T>::~IOList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -154,11 +147,4 @@ void Foam::IOList<T>::operator=(const IOList<T>& rhs)
 }
 
 
-template<class T>
-void Foam::IOList<T>::operator=(const List<T>& rhs)
-{
-    List<T>::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index ea5b42dc50..ecee9a5f15 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,6 @@ class IOList
     public regIOobject,
     public List<T>
 {
-
 public:
 
     //- Runtime type information
@@ -62,33 +61,39 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOList(const IOList&) = default;
+
         //- Construct from IOobject
-        IOList(const IOobject&);
+        explicit IOList(const IOobject& io);
 
         //- Construct from IOobject and size of IOList
-        IOList(const IOobject&, const label);
+        IOList(const IOobject& io, const label len);
 
-        //- Construct from IOobject and a List
-        IOList(const IOobject&, const List<T>&);
+        //- Construct from IOobject and a copy of UList content
+        IOList(const IOobject& io, const UList<T>& content);
 
-        //- Construct by transferring the List contents
-        IOList(const IOobject&, const Xfer<List<T>>&);
+        //- Construct by transferring the List content
+        IOList(const IOobject& io, List<T>&& content);
 
 
     //- Destructor
-    virtual ~IOList();
+    virtual ~IOList() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        bool writeData(Ostream&) const;
+        bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const IOList<T>&);
+        //- Copy assignment of entries
+        void operator=(const IOList<T>& rhs);
+
+        //- Copy or move assignment of entries
+        using List<T>::operator=;
 
-        void operator=(const List<T>&);
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index 3e1cea8c95..e8071821dd 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +77,7 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const label size)
 
 
 template<class T>
-Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
+Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& content)
 :
     regIOobject(io)
 {
@@ -98,17 +98,17 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
     }
     else
     {
-        Map<T>::operator=(map);
+        Map<T>::operator=(content);
     }
 }
 
 
 template<class T>
-Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
+Foam::IOMap<T>::IOMap(const IOobject& io, Map<T>&& content)
 :
     regIOobject(io)
 {
-    Map<T>::transfer(map());
+    Map<T>::transfer(content);
 
     if
     (
@@ -128,13 +128,6 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOMap<T>::~IOMap()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -153,11 +146,4 @@ void Foam::IOMap<T>::operator=(const IOMap<T>& rhs)
 }
 
 
-template<class T>
-void Foam::IOMap<T>::operator=(const Map<T>& rhs)
-{
-    Map<T>::operator=(rhs);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index 5dce64772f..15d3a08e2b 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class IOMap Declaration
+                            Class IOMap Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class T>
@@ -54,7 +54,6 @@ class IOMap
     public regIOobject,
     public Map<T>
 {
-
 public:
 
     //- Runtime type information
@@ -63,26 +62,29 @@ public:
 
     // Constructors
 
+        //- Default copy construct
+        IOMap(const IOMap&) = default;
+
         //- Construct from IOobject
-        IOMap(const IOobject&);
+        explicit IOMap(const IOobject& io);
 
         //- Construct from IOobject and size of Map
-        IOMap(const IOobject&, const label);
+        IOMap(const IOobject& io, const label size);
 
-        //- Construct from IOobject and a Map
-        IOMap(const IOobject&, const Map<T>&);
+        //- Construct from IOobject and a copy of Map content
+        IOMap(const IOobject&, const Map<T>& content);
 
-        //- Construct by transferring the Map contents
-        IOMap(const IOobject&, const Xfer<Map<T>>&);
+        //- Construct by transferring the Map content
+        IOMap(const IOobject&, Map<T>&& content);
 
 
     //- Destructor
-    virtual ~IOMap();
+    virtual ~IOMap() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        bool writeData(Ostream&) const;
+        bool writeData(Ostream& os) const;
 
         //- Is object global
         virtual bool global() const
@@ -97,13 +99,13 @@ public:
             return globalFilePath(type());
         }
 
-    // Member operators
+    // Member Operators
 
-        //- Assignment of other IOMap's entries to this IOMap
-        void operator=(const IOMap<T>&);
+        //- Copy assignment of entries
+        void operator=(const IOMap<T>& rhs);
 
-        //- Assignment of other Map's entries to this IOMap
-        void operator=(const Map<T>&);
+        //- Copy or move assignment of entries
+        using Map<T>::operator=;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index 9e39ab5150..aa0bcbf30c 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,10 +75,10 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io)
 
 
 template<class T>
-Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const label s)
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const label len)
 :
     regIOobject(io),
-    PtrList<T>(s)
+    PtrList<T>(len)
 {
     if (io.readOpt() != IOobject::NO_READ)
     {
@@ -90,7 +90,7 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const label s)
 
 
 template<class T>
-Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& content)
 :
     regIOobject(io)
 {
@@ -111,17 +111,17 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
     }
     else
     {
-        PtrList<T>::operator=(list);
+        PtrList<T>::operator=(content);
     }
 }
 
 
 template<class T>
-Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, PtrList<T>&& content)
 :
     regIOobject(io)
 {
-    PtrList<T>::transfer(list());
+    PtrList<T>::transfer(content);
 
     if
     (
@@ -141,13 +141,6 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-template<class T>
-Foam::IOPtrList<T>::~IOPtrList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -165,4 +158,5 @@ void Foam::IOPtrList<T>::operator=(const IOPtrList<T>& rhs)
     PtrList<T>::operator=(rhs);
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 09df9ba721..28e16b9719 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,6 @@ class IOPtrList
     public regIOobject,
     public PtrList<T>
 {
-
 public:
 
     //- Runtime type information
@@ -62,35 +61,42 @@ public:
 
     // Constructors
 
-        //- Construct from IOobject using given Istream constructor class
-        template<class INew>
-        IOPtrList(const IOobject&, const INew&);
+        //- Default copy construct
+        IOPtrList(const IOPtrList&) = default;
 
         //- Construct from IOobject
-        IOPtrList(const IOobject&);
+        explicit IOPtrList(const IOobject& io);
+
+        //- Construct from IOobject using given Istream constructor class
+        template<class INew>
+        IOPtrList(const IOobject& io, const INew& inewt);
 
         //- Construct from IOobject with given size
-        IOPtrList(const IOobject&, const label);
+        IOPtrList(const IOobject& io, const label len);
 
-        //- Construct from IOobject and a PtrList
-        IOPtrList(const IOobject&, const PtrList<T>&);
+        //- Construct from IOobject and a copy of PtrList content
+        IOPtrList(const IOobject& io, const PtrList<T>& content);
 
-        //- Construct by transferring the PtrList contents
-        IOPtrList(const IOobject&, const Xfer<PtrList<T>>&);
+        //- Construct by transferring the PtrList content
+        IOPtrList(const IOobject& io, PtrList<T>&& content);
 
 
     //- Destructor
-    virtual ~IOPtrList();
+    virtual ~IOPtrList() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        bool writeData(Ostream&) const;
+        bool writeData(Ostream& os) const;
 
 
-    // Member operators
+    // Member Operators
 
-        void operator=(const IOPtrList<T>&);
+        //- Copy assignment of entries
+        void operator=(const IOPtrList<T>& rhs);
+
+        //- Copy or move assignment of entries
+        using PtrList<T>::operator=;
 };
 
 
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index 1604a31e57..830c959494 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -122,7 +122,7 @@ Foam::decomposedBlockData::decomposedBlockData
 (
     const label comm,
     const IOobject& io,
-    const Xfer<List<char>>& list,
+    List<char>&& list,
     const UPstream::commsTypes commsType
 )
 :
@@ -140,7 +140,7 @@ Foam::decomposedBlockData::decomposedBlockData
             << endl;
     }
 
-    List<char>::transfer(list());
+    List<char>::transfer(list);
 
     if
     (
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
index 1def38f9eb..2223846d1b 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
@@ -87,7 +87,7 @@ public:
         decomposedBlockData
         (
             const label comm,
-            const IOobject&,
+            const IOobject& io,
             const UPstream::commsTypes = UPstream::commsTypes::scheduled
         );
 
@@ -95,17 +95,17 @@ public:
         decomposedBlockData
         (
             const label comm,
-            const IOobject&,
-            const UList<char>&,
+            const IOobject& io,
+            const UList<char>& list,
             const UPstream::commsTypes = UPstream::commsTypes::scheduled
         );
 
-        //- Construct by transferring the IOList contents
+        //- Construct by transferring the List contents
         decomposedBlockData
         (
             const label comm,
-            const IOobject&,
-            const Xfer<List<char>>&,
+            const IOobject& io,
+            List<char>&& list,
             const UPstream::commsTypes = UPstream::commsTypes::scheduled
         );
 
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 4e13175f0d..aa1060e74e 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -98,13 +98,13 @@ public:
         ITstream
         (
             const string& name,
-            const Xfer<List<token>>& tokens,
+            List<token>&& tokens,
             streamFormat format=ASCII,
             versionNumber version=currentVersion
         )
         :
             Istream(format, version),
-            tokenList(tokens),
+            tokenList(std::move(tokens)),
             name_(name),
             tokenIndex_(0)
         {
diff --git a/src/OpenFOAM/db/IOstreams/memory/IListStream.H b/src/OpenFOAM/db/IOstreams/memory/IListStream.H
index 6f20eeb765..c6a28558f1 100644
--- a/src/OpenFOAM/db/IOstreams/memory/IListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/IListStream.H
@@ -83,13 +83,6 @@ protected:
             UIListStreamAllocator(List<char>::data(), List<char>::size())
         {}
 
-        //- Transfer (move) construct
-        IListStreamAllocator(const Xfer<List<char>>& buffer)
-        :
-            List<char>(buffer),
-            UIListStreamAllocator(List<char>::data(), List<char>::size())
-        {}
-
 
     // Protected Member Functions
 
@@ -110,12 +103,6 @@ public:
         //- The current get position in the buffer
         using UIListStreamAllocator::size;
 
-        inline void swap(List<char>& list)
-        {
-            List<char>::swap(list);
-            reset_gbuffer();
-        }
-
         //- Clear storage
         inline void clearStorage()
         {
@@ -123,12 +110,11 @@ public:
             reset_gbuffer();
         }
 
-        //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<char>> xfer()
+        //- Transfer contents to other list
+        inline void swap(List<char>& list)
         {
-            Xfer<List<char>> moved = List<char>::xfer();
+            List<char>::swap(list);
             reset_gbuffer();
-            return moved;
         }
 };
 
@@ -191,20 +177,6 @@ public:
         {}
 
 
-        //- Transfer (move) construct
-        IListStream
-        (
-            const Xfer<List<char>>& buffer,
-            streamFormat format=ASCII,
-            versionNumber version=currentVersion,
-            const Foam::string& name="input"
-        )
-        :
-            allocator_type(buffer),
-            ISstream(stream_, name, format, version)
-        {}
-
-
     // Member functions
 
         //- The current get position in the buffer
diff --git a/src/OpenFOAM/db/IOstreams/memory/OListStream.H b/src/OpenFOAM/db/IOstreams/memory/OListStream.H
index aa1776dc80..c7d35f1aa4 100644
--- a/src/OpenFOAM/db/IOstreams/memory/OListStream.H
+++ b/src/OpenFOAM/db/IOstreams/memory/OListStream.H
@@ -198,14 +198,6 @@ class OListStreamAllocator
             init_pbuffer(block_);
         }
 
-        //- Transfer (move) construct
-        dynbuf(const Xfer<List<char>>& buffer)
-        :
-            storage_(buffer)
-        {
-            init_pbuffer(block_);
-        }
-
 
     // Member Functions
 
@@ -237,14 +229,12 @@ class OListStreamAllocator
             pbump(cur);
         }
 
-        //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<char>> xfer()
+        //- Transfer list contents to other list
+        inline void swap(List<char>& other)
         {
-            const auto cur = tellp();   // Addressed area
-            storage_.resize(cur);
-            auto lst = storage_.xfer();
+            storage_.resize(tellp());   // Addressed area
+            storage_.swap(other);
             sync_pbuffer();
-            return lst;
         }
     };
 
@@ -285,13 +275,6 @@ protected:
             stream_(&buf_)
         {}
 
-        //- Transfer (move) construct
-        OListStreamAllocator(const Xfer<List<char>>& buffer)
-        :
-            buf_(buffer),
-            stream_(&buf_)
-        {}
-
 
     // Protected Member Functions
 
@@ -348,10 +331,10 @@ public:
             return buf_.setBlockSize(n);
         }
 
-        //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<char>> xfer()
+        //- Transfer list contents to other list
+        inline void swap(List<char>& other)
         {
-            return buf_.xfer();
+            buf_.swap(other);
         }
 
         //- Shrink to addressed space, should not affect stream.
@@ -443,18 +426,6 @@ public:
             OSstream(stream_, "output", format, version)
         {}
 
-        //- Transfer (move) construct
-        OListStream
-        (
-            const Xfer<List<char>>& buffer,
-            streamFormat format=ASCII,
-            versionNumber version=currentVersion
-        )
-        :
-            allocator_type(buffer),
-            OSstream(stream_, "output", format, version)
-        {}
-
 
     // Member Functions
 
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index a5a926df25..9a96860e7f 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -127,24 +127,24 @@ Foam::dictionary::dictionary
 Foam::dictionary::dictionary
 (
     const dictionary& parentDict,
-    const Xfer<dictionary>& dict
+    dictionary&& dict
 )
 :
     parent_(parentDict)
 {
-    transfer(dict());
+    transfer(dict);
     name() = parentDict.name() + '.' + name();
 }
 
 
 Foam::dictionary::dictionary
 (
-    const Xfer<dictionary>& dict
+    dictionary&& dict
 )
 :
     parent_(dictionary::null)
 {
-    transfer(dict());
+    transfer(dict);
 }
 
 
@@ -770,12 +770,6 @@ void Foam::dictionary::transfer(dictionary& dict)
 }
 
 
-Foam::Xfer<Foam::dictionary> Foam::dictionary::xfer()
-{
-    return xferMove(*this);
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 Foam::ITstream& Foam::dictionary::operator[](const word& keyword) const
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 671aba903d..912887a54d 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -417,21 +417,21 @@ public:
         //  reading entries until EOF, optionally keeping the header
         dictionary(Istream& is, bool keepHeader);
 
-        //- Construct as copy given the parent dictionary
+        //- Copy construct given the parent dictionary
         dictionary(const dictionary& parentDict, const dictionary& dict);
 
-        //- Construct top-level dictionary as copy
+        //- Copy construct top-level dictionary
         dictionary(const dictionary& dict);
 
         //- Construct top-level dictionary as copy from pointer to dictionary.
         //  A null pointer is treated like an empty dictionary.
         dictionary(const dictionary* dictPtr);
 
-        //- Construct by transferring parameter contents given parent dictionary
-        dictionary(const dictionary& parentDict, const Xfer<dictionary>& dict);
+        //- Move construct for given parent dictionary
+        dictionary(const dictionary& parentDict, dictionary&& dict);
 
-        //- Construct top-level dictionary by transferring parameter contents
-        dictionary(const Xfer<dictionary>& dict);
+        //- Move construct top-level dictionary
+        dictionary(dictionary&& dict);
 
         //- Construct and return clone
         autoPtr<dictionary> clone() const;
@@ -774,9 +774,6 @@ public:
         //- Transfer the contents of the argument and annul the argument.
         void transfer(dictionary& dict);
 
-        //- Transfer contents to the Xfer container
-        Xfer<dictionary> xfer();
-
 
       // Read
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 4730295740..0998353e9f 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -106,7 +106,7 @@ bool Foam::primitiveEntry::expandVariable
     {
         // Found dictionary entry
 
-        tokenList toks(eptr->dict().tokens().xfer());
+        tokenList toks(eptr->dict().tokens());
 
         appendTokenList(std::move(toks));
     }
@@ -152,11 +152,11 @@ Foam::primitiveEntry::primitiveEntry
 Foam::primitiveEntry::primitiveEntry
 (
     const keyType& key,
-    const Xfer<List<token>>& tokens
+    List<token>&& tokens
 )
 :
     entry(key),
-    ITstream(key, tokens)
+    ITstream(key, std::move(tokens))
 {}
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index c035f4451a..86bea927e5 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -126,7 +126,7 @@ public:
         primitiveEntry(const keyType& key, const UList<token>& tokens);
 
         //- Construct from keyword and by transferring a list of tokens
-        primitiveEntry(const keyType& key, const Xfer<List<token>>& tokens);
+        primitiveEntry(const keyType& key, List<token>&& tokens);
 
         //- Construct from keyword and a T
         template<class T>
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index f2f54f3270..305768d711 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -93,29 +93,11 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     const IOobject& io,
     const Mesh& mesh,
     const dimensionSet& dims,
-    const Xfer<Field<Type>>& field
+    List<Type>&& field
 )
 :
     regIOobject(io),
-    Field<Type>(field),
-    mesh_(mesh),
-    dimensions_(dims)
-{
-    checkFieldSize();
-}
-
-
-template<class Type, class GeoMesh>
-DimensionedField<Type, GeoMesh>::DimensionedField
-(
-    const IOobject& io,
-    const Mesh& mesh,
-    const dimensionSet& dims,
-    const Xfer<List<Type>>& field
-)
-:
-    regIOobject(io),
-    Field<Type>(field),
+    Field<Type>(std::move(field)),
     mesh_(mesh),
     dimensions_(dims)
 {
@@ -199,14 +181,14 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    const Xfer<DimensionedField<Type, GeoMesh>>& df
+    DimensionedField<Type, GeoMesh>&& df
 )
 :
-    regIOobject(df(), true),
-    Field<Type>(df),
-    mesh_(df->mesh_),
-    dimensions_(df->dimensions_),
-    oriented_(df->oriented_)
+    regIOobject(df, true),
+    Field<Type>(std::move(df)),
+    mesh_(df.mesh_),
+    dimensions_(df.dimensions_),
+    oriented_(df.oriented_)
 {}
 
 
@@ -294,14 +276,14 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    const Xfer<DimensionedField<Type, GeoMesh>>& df
+    DimensionedField<Type, GeoMesh>&& df
 )
 :
     regIOobject(newName, df, true),
-    Field<Type>(df),
-    mesh_(df->mesh_),
-    dimensions_(df->dimensions_),
-    oriented_(df->oriented_)
+    Field<Type>(std::move(df)),
+    mesh_(df.mesh_),
+    dimensions_(df.dimensions_),
+    oriented_(df.oriented_)
 {}
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index e37bcccc21..8abae114e7 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -141,16 +141,7 @@ public:
             const IOobject& io,
             const Mesh& mesh,
             const dimensionSet& dims,
-            const Xfer<Field<Type>>& field
-        );
-
-        //- Construct from components, transferring the initial field content
-        DimensionedField
-        (
-            const IOobject& io,
-            const Mesh& mesh,
-            const dimensionSet& dims,
-            const Xfer<List<Type>>& field
+            List<Type>&& field
         );
 
         //- Construct from components
@@ -203,9 +194,9 @@ public:
         );
 
         //- Construct by transferring the DimensionedField
-        DimensionedField
+        explicit DimensionedField
         (
-            const Xfer<DimensionedField<Type, GeoMesh>>& df
+            DimensionedField<Type, GeoMesh>&& df
         );
 
         //- Construct as copy of tmp<DimensionedField> deleting argument
@@ -250,7 +241,7 @@ public:
         DimensionedField
         (
             const word& newName,
-            const Xfer<DimensionedField<Type, GeoMesh>>& df
+            DimensionedField<Type, GeoMesh>&& df
         );
 
         //- Construct as copy resetting name
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 1d99fcb6b6..3531b44d9e 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 template<class T, int SizeMin> class DynamicField;
 
@@ -93,7 +93,7 @@ public:
         //- Return a null field
         inline static const DynamicField<T, SizeMin>& null()
         {
-            return *reinterpret_cast<DynamicField<T, SizeMin>*>(0);
+            return NullObjectRef<DynamicField<T, SizeMin>>();
         }
 
 
@@ -102,24 +102,30 @@ public:
         //- Construct null
         inline DynamicField();
 
-        //- Construct given size.
-        explicit inline DynamicField(const label nElem);
+        //- Construct with given capacity.
+        explicit inline DynamicField(const label len);
 
-        //- Construct from UList. Size set to UList size.
+        //- Copy construct
+        inline DynamicField(const DynamicField<T, SizeMin>& lst);
+
+        //- Copy construct from UList. Size set to UList size.
         //  Also constructs from DynamicField with different sizing parameters.
         explicit inline DynamicField(const UList<T>& lst);
 
-        //- Construct by transferring the parameter contents
-        explicit inline DynamicField(const Xfer<List<T>>& lst);
+        //- Copy construct from UIndirectList
+        explicit inline DynamicField(const UIndirectList<T>& list);
 
-        //- Construct by transferring the parameter contents
-        explicit inline DynamicField(const Xfer<Field<T>>& lst);
+        //- Move construct from List contents
+        explicit inline DynamicField(List<T>&& content);
+
+        //- Move construct from Field contents
+        inline DynamicField(DynamicField<T, SizeMin>&& content);
 
         //- Construct by 1 to 1 mapping from the given field
         inline DynamicField
         (
             const UList<T>& mapF,
-            const labelList& mapAddressing
+            const labelUList& mapAddressing
         );
 
         //- Construct by interpolative mapping from the given field
@@ -137,15 +143,6 @@ public:
             const FieldMapper& map
         );
 
-        //- Construct copy
-        inline DynamicField(const DynamicField<T, SizeMin>& lst);
-
-        //- Construct by transferring the Field contents
-        inline DynamicField
-        (
-            const Xfer<DynamicField<T, SizeMin>>& lst
-        );
-
         //- Construct from Istream. Size set to size of list read.
         explicit DynamicField(Istream& is);
 
@@ -207,9 +204,6 @@ public:
             //  Returns a reference to the DynamicField.
             inline DynamicField<T, SizeMin>& shrink();
 
-            //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T>> xfer();
-
 
         // Member Operators
 
@@ -239,6 +233,7 @@ public:
 
             //- Assignment to UList
             inline void operator=(const UList<T>& lst);
+
 };
 
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index 782e2c90ee..316b43c9c2 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -56,7 +56,7 @@ inline void Foam::DynamicField<T, SizeMin>::assignDynField
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField()
 :
-    Field<T>(0),
+    Field<T>(),
     capacity_(Field<T>::size())
 {}
 
@@ -64,10 +64,10 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField()
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField
 (
-    const label nElem
+    const label len
 )
 :
-    Field<T>(nElem),
+    Field<T>(len),
     capacity_(Field<T>::size())
 {
     // We could also enforce sizing granularity
@@ -75,6 +75,17 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField
 }
 
 
+template<class T, int SizeMin>
+inline Foam::DynamicField<T, SizeMin>::DynamicField
+(
+    const DynamicField<T, SizeMin>& lst
+)
+:
+    Field<T>(lst),
+    capacity_(lst.capacity())
+{}
+
+
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField
 (
@@ -89,7 +100,7 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField
 (
-    const Xfer<List<T>>& lst
+    const UIndirectList<T>& lst
 )
 :
     Field<T>(lst),
@@ -100,19 +111,32 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField
 (
-    const Xfer<Field<T>>& lst
+    List<T>&& content
 )
 :
-    Field<T>(lst),
+    Field<T>(std::move(content)),
     capacity_(Field<T>::size())
 {}
 
 
+template<class T, int SizeMin>
+inline Foam::DynamicField<T, SizeMin>::DynamicField
+(
+    DynamicField<T, SizeMin>&& content
+)
+:
+    Field<T>(std::move(content)),
+    capacity_(Field<T>::size())
+{
+    content.clear();
+}
+
+
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>::DynamicField
 (
     const UList<T>& mapF,
-    const labelList& mapAddressing
+    const labelUList& mapAddressing
 )
 :
     Field<T>(mapF, mapAddressing),
@@ -146,28 +170,6 @@ inline Foam::DynamicField<T, SizeMin>::DynamicField
 {}
 
 
-template<class T, int SizeMin>
-inline Foam::DynamicField<T, SizeMin>::DynamicField
-(
-    const DynamicField<T, SizeMin>& lst
-)
-:
-    Field<T>(lst),
-    capacity_(lst.capacity())
-{}
-
-
-template<class T, int SizeMin>
-inline Foam::DynamicField<T, SizeMin>::DynamicField
-(
-    const Xfer<DynamicField<T, SizeMin>>& lst
-)
-:
-    Field<T>(lst),
-    capacity_(Field<T>::size())
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, int SizeMin>
@@ -341,14 +343,6 @@ Foam::DynamicField<T, SizeMin>::shrink()
 }
 
 
-template<class T, int SizeMin>
-inline Foam::Xfer<Foam::List<T>>
-Foam::DynamicField<T, SizeMin>::xfer()
-{
-    return xferMoveTo<List<T>>(*this);
-}
-
-
 template<class T, int SizeMin>
 inline Foam::DynamicField<T, SizeMin>&
 Foam::DynamicField<T, SizeMin>::append
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 1cb7cacf83..8432190fb5 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,26 +45,75 @@ Foam::Field<Type>::Field()
 
 
 template<class Type>
-Foam::Field<Type>::Field(const label size)
+Foam::Field<Type>::Field(const label len)
 :
-    List<Type>(size)
+    List<Type>(len)
 {}
 
 
 template<class Type>
-Foam::Field<Type>::Field(const label size, const Type& t)
+Foam::Field<Type>::Field(const label len, const Type& val)
 :
-    List<Type>(size, t)
+    List<Type>(len, val)
 {}
 
 
 template<class Type>
-Foam::Field<Type>::Field(const label size, const zero)
+Foam::Field<Type>::Field(const label len, const zero)
 :
-    List<Type>(size, Zero)
+    List<Type>(len, Zero)
 {}
 
 
+template<class Type>
+Foam::Field<Type>::Field(const Field<Type>& fld)
+:
+    List<Type>(fld)
+{}
+
+
+template<class Type>
+Foam::Field<Type>::Field(const UList<Type>& list)
+:
+    List<Type>(list)
+{}
+
+
+template<class Type>
+Foam::Field<Type>::Field(const UIndirectList<Type>& list)
+:
+    List<Type>(list)
+{}
+
+
+template<class Type>
+Foam::Field<Type>::Field(Field<Type>&& fld)
+:
+    List<Type>()
+{
+    List<Type>::transfer(fld);
+}
+
+
+template<class Type>
+Foam::Field<Type>::Field(List<Type>&& list)
+:
+    List<Type>()
+{
+    List<Type>::transfer(list);
+}
+
+
+template<class Type>
+template<int SizeMin>
+Foam::Field<Type>::Field(DynamicList<Type, SizeMin>&& list)
+:
+    List<Type>()
+{
+    List<Type>::transfer(list);
+}
+
+
 template<class Type>
 Foam::Field<Type>::Field
 (
@@ -208,57 +257,19 @@ Foam::Field<Type>::Field
 
 
 template<class Type>
-Foam::Field<Type>::Field(const Field<Type>& f)
+Foam::Field<Type>::Field(Field<Type>& fld, bool reuse)
 :
-    tmp<Field<Type>>::refCount(),
-    List<Type>(f)
-{}
-
-
-template<class Type>
-Foam::Field<Type>::Field(Field<Type>& f, bool reuse)
-:
-    List<Type>(f, reuse)
-{}
-
-
-template<class Type>
-Foam::Field<Type>::Field(const Xfer<List<Type>>& f)
-:
-    List<Type>(f)
-{}
-
-
-template<class Type>
-Foam::Field<Type>::Field(const Xfer<Field<Type>>& f)
-:
-    List<Type>()
-{
-    List<Type>::transfer(f());
-}
-
-
-template<class Type>
-Foam::Field<Type>::Field(const UList<Type>& list)
-:
-    List<Type>(list)
-{}
-
-
-template<class Type>
-Foam::Field<Type>::Field(const UIndirectList<Type>& list)
-:
-    List<Type>(list)
+    List<Type>(fld, reuse)
 {}
 
 
 #ifndef NoConstructFromTmp
 template<class Type>
-Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
+Foam::Field<Type>::Field(const tmp<Field<Type>>& tfld)
 :
-    List<Type>(tf.constCast(), tf.movable())
+    List<Type>(tfld.constCast(), tfld.movable())
 {
-    tf.clear();
+    tfld.clear();
 }
 #endif
 
@@ -275,10 +286,10 @@ Foam::Field<Type>::Field
 (
     const word& keyword,
     const dictionary& dict,
-    const label s
+    const label len
 )
 {
-    if (s)
+    if (len)
     {
         ITstream& is = dict.lookup(keyword);
 
@@ -289,19 +300,19 @@ Foam::Field<Type>::Field
         {
             if (firstToken.wordToken() == "uniform")
             {
-                this->setSize(s);
+                this->setSize(len);
                 operator=(pTraits<Type>(is));
             }
             else if (firstToken.wordToken() == "nonuniform")
             {
                 is >> static_cast<List<Type>&>(*this);
-                if (this->size() != s)
+                if (this->size() != len)
                 {
                     FatalIOErrorInFunction
                     (
                         dict
                     )   << "size " << this->size()
-                        << " is not equal to the given value of " << s
+                        << " is not equal to the given value of " << len
                         << exit(FatalIOError);
                 }
             }
@@ -326,7 +337,7 @@ Foam::Field<Type>::Field
                        "assuming deprecated Field format from "
                        "Foam version 2.0." << endl;
 
-                this->setSize(s);
+                this->setSize(len);
 
                 is.putBack(firstToken);
                 operator=(pTraits<Type>(is));
@@ -372,7 +383,7 @@ void Foam::Field<Type>::map
     {
         forAll(f, i)
         {
-            label mapI = mapAddressing[i];
+            const label mapI = mapAddressing[i];
 
             if (mapI >= 0)
             {
@@ -773,14 +784,14 @@ void Foam::Field<Type>::operator=(const Field<Type>& rhs)
 
 
 template<class Type>
-void Foam::Field<Type>::operator=(const SubField<Type>& rhs)
+void Foam::Field<Type>::operator=(const UList<Type>& rhs)
 {
     List<Type>::operator=(rhs);
 }
 
 
 template<class Type>
-void Foam::Field<Type>::operator=(const UList<Type>& rhs)
+void Foam::Field<Type>::operator=(const SubField<Type>& rhs)
 {
     List<Type>::operator=(rhs);
 }
@@ -801,9 +812,31 @@ void Foam::Field<Type>::operator=(const tmp<Field>& rhs)
 
 
 template<class Type>
-void Foam::Field<Type>::operator=(const Type& t)
+void Foam::Field<Type>::operator=(Field<Type>&& rhs)
 {
-    List<Type>::operator=(t);
+    List<Type>::transfer(rhs);
+}
+
+
+template<class Type>
+void Foam::Field<Type>::operator=(List<Type>&& rhs)
+{
+    List<Type>::transfer(rhs);
+}
+
+
+template<class Type>
+template<int SizeMin>
+void Foam::Field<Type>::operator=(DynamicList<Type, SizeMin>&& rhs)
+{
+    List<Type>::transfer(rhs);
+}
+
+
+template<class Type>
+void Foam::Field<Type>::operator=(const Type& val)
+{
+    List<Type>::operator=(val);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 1af0dbdc59..deb6e58b50 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,14 +52,12 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
+class FieldMapper;
+class dictionary;
 
-template<class Type>
-class Field;
-
-//- Pre-declare related SubField type
-template<class Type>
-class SubField;
+template<class Type> class Field;
+template<class Type> class SubField;
 
 template<class Type>
 Ostream& operator<<(Ostream&, const Field<Type>&);
@@ -67,9 +65,6 @@ Ostream& operator<<(Ostream&, const Field<Type>&);
 template<class Type>
 Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
 
-class FieldMapper;
-class dictionary;
-
 /*---------------------------------------------------------------------------*\
                            Class Field Declaration
 \*---------------------------------------------------------------------------*/
@@ -97,7 +92,7 @@ public:
 
     // Static Member Functions
 
-        //- Return a null field
+        //- Return nullObject reference field
         inline static const Field<Type>& null()
         {
             return NullObjectRef<Field<Type>>();
@@ -107,27 +102,37 @@ public:
     // Constructors
 
         //- Construct null
-        //  Used for temporary fields which are initialised after construction
+        //  For temporary fields that are initialised after construction
         Field();
 
         //- Construct given size
-        //  Used for temporary fields which are initialised after construction
-        explicit Field(const label);
+        //  For temporary fields that are initialised after construction
+        explicit Field(const label len);
 
         //- Construct given size and initial value
-        Field(const label, const Type&);
+        Field(const label len, const Type& val);
 
-        //- Construct given size and initialed to zero
-        Field(const label, const zero);
+        //- Construct given size and initial values of zero
+        Field(const label len, const zero);
 
-        //- Construct as copy of a UList\<Type\>
-        explicit Field(const UList<Type>&);
+        //- Copy construct
+        Field(const Field<Type>& fld);
 
-        //- Construct as copy of a UIndirectList\<Type\>
-        explicit Field(const UIndirectList<Type>&);
+        //- Copy construct from UList\<Type\>
+        explicit Field(const UList<Type>& list);
 
-        //- Construct by transferring the List contents
-        explicit Field(const Xfer<List<Type>>&);
+        //- Copy construct from UIndirectList\<Type\>
+        explicit Field(const UIndirectList<Type>& list);
+
+        //- Move construct from Field
+        Field(Field<Type>&& fld);
+
+        //- Move construct from List
+        Field(List<Type>&& list);
+
+        //- Move construct from DynamicList
+        template<int SizeMin>
+        Field(DynamicList<Type, SizeMin>&& list);
 
         //- Construct by 1 to 1 mapping from the given field
         Field
@@ -213,25 +218,19 @@ public:
             const bool applyFlip = true
         );
 
-        //- Construct as copy
-        Field(const Field<Type>&);
+        //- Copy construct or re-use as specified.
+        Field(Field<Type>& fld, bool reuse);
 
-        //- Construct as copy or re-use as specified.
-        Field(Field<Type>&, bool reuse);
-
-        //- Construct by transferring the Field contents
-        Field(const Xfer<Field<Type>>&);
-
-        //- Construct as copy of tmp<Field>
+        //- Copy or move construct from tmp
         #ifndef NoConstructFromTmp
-        Field(const tmp<Field<Type>>&);
+        Field(const tmp<Field<Type>>& tfld);
         #endif
 
         //- Construct from Istream
-        Field(Istream&);
+        Field(Istream& is);
 
         //- Construct from a dictionary entry
-        Field(const word& keyword, const dictionary&, const label size);
+        Field(const word& keyword, const dictionary& dict, const label len);
 
         //- Clone
         tmp<Field<Type>> clone() const;
@@ -357,10 +356,21 @@ public:
 
     // Member operators
 
+        //- Copy assignment
         void operator=(const Field<Type>&);
         void operator=(const UList<Type>&);
         void operator=(const SubField<Type>&);
         void operator=(const tmp<Field<Type>>&);
+
+        //- Move assignment
+        void operator=(Field<Type>&& rhs);
+        void operator=(List<Type>&& rhs);
+
+        template<int SizeMin>
+        void operator=(DynamicList<Type, SizeMin>&& rhs);
+
+
+        //- Value assignment
         void operator=(const Type&);
         void operator=(const zero);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 6a57e0a0d0..2995a7659f 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -508,6 +508,7 @@ void Foam::globalMeshData::calcSharedEdges() const
         }
     }
 
+
     sharedEdgeLabelsPtr_.reset(new labelList());
     labelList& sharedEdgeLabels = sharedEdgeLabelsPtr_();
     sharedEdgeLabels.transfer(dynSharedEdgeLabels);
@@ -543,14 +544,14 @@ void Foam::globalMeshData::calcGlobalPointSlaves() const
     (
         new labelListList
         (
-            globalData.pointPoints().xfer()
+            std::move(globalData.pointPoints())
         )
     );
     globalPointTransformedSlavesPtr_.reset
     (
         new labelListList
         (
-            globalData.transformedPointPoints().xfer()
+            std::move(globalData.transformedPointPoints())
         )
     );
 
@@ -558,7 +559,7 @@ void Foam::globalMeshData::calcGlobalPointSlaves() const
     (
         new mapDistribute
         (
-            globalData.map().xfer()
+            std::move(globalData.map())
         )
     );
 }
@@ -1738,14 +1739,14 @@ void Foam::globalMeshData::calcGlobalCoPointSlaves() const
     (
         new labelListList
         (
-            globalData.pointPoints().xfer()
+            std::move(globalData.pointPoints())
         )
     );
     globalCoPointSlavesMapPtr_.reset
     (
         new mapDistribute
         (
-            globalData.map().xfer()
+            std::move(globalData.map())
         )
     );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
index b4a0c7b723..f90f7a33a6 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,7 @@ Foam::IOmapDistribute::IOmapDistribute
 Foam::IOmapDistribute::IOmapDistribute
 (
     const IOobject& io,
-    const Xfer<mapDistribute>& map
+    mapDistribute&& map
 )
 :
     regIOobject(io)
@@ -98,7 +98,7 @@ Foam::IOmapDistribute::IOmapDistribute
     // Warn for MUST_READ_IF_MODIFIED
     warnNoRereading<IOmapDistribute>();
 
-    mapDistribute::transfer(map());
+    mapDistribute::transfer(map);
 
     if
     (
@@ -115,12 +115,6 @@ Foam::IOmapDistribute::IOmapDistribute
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
-
-Foam::IOmapDistribute::~IOmapDistribute()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::IOmapDistribute::readData(Istream& is)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H
index 271fb062f5..1b854981ea 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,17 +63,17 @@ public:
     // Constructors
 
         //- Construct given an IOobject
-        IOmapDistribute(const IOobject&);
+        IOmapDistribute(const IOobject& io);
 
-        //- Construct given an IOobject and mapDistribute
-        IOmapDistribute(const IOobject&, const mapDistribute&);
+        //- Construct given an IOobject, copying mapDistribute contents
+        IOmapDistribute(const IOobject& io, const mapDistribute& map);
 
-        //- Construct by transferring the mapDistribute contents
-        IOmapDistribute(const IOobject&, const Xfer<mapDistribute>&);
+        //- Construct, moving mapDistribute contents
+        IOmapDistribute(const IOobject& io, mapDistribute&& map);
 
 
     //- Destructor
-    virtual ~IOmapDistribute();
+    virtual ~IOmapDistribute() = default;
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index b97a0c81e1..25996770bc 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(mapDistribute, 0);
+    defineTypeNameAndDebug(mapDistribute, 0);
 }
 
 
@@ -43,29 +43,28 @@ void Foam::mapDistribute::transform::operator()
     const vectorTensorTransform&,
     const bool,
     List<label>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     UList<label>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     Map<label>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<label>&
-) const
-{}
+) const {}
 
 
 template<>
@@ -74,29 +73,28 @@ void Foam::mapDistribute::transform::operator()
     const vectorTensorTransform&,
     const bool,
     List<scalar>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     UList<scalar>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     Map<scalar>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<scalar>&
-) const
-{}
+) const {}
 
 
 template<>
@@ -105,29 +103,28 @@ void Foam::mapDistribute::transform::operator()
     const vectorTensorTransform&,
     const bool,
     List<bool>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     UList<bool>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     Map<bool>&
-) const
-{}
+) const {}
+
 template<>
 void Foam::mapDistribute::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<bool>&
-) const
-{}
+) const {}
 
 
 void Foam::mapDistribute::printLayout(Ostream& os) const
@@ -154,11 +151,27 @@ Foam::mapDistribute::mapDistribute()
 {}
 
 
+Foam::mapDistribute::mapDistribute(const mapDistribute& map)
+:
+    mapDistributeBase(map),
+    transformElements_(map.transformElements_),
+    transformStart_(map.transformStart_)
+{}
+
+
+Foam::mapDistribute::mapDistribute(mapDistribute&& map)
+:
+    mapDistribute()
+{
+    transfer(map);
+}
+
+
 Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
-    const Xfer<labelListList>& subMap,
-    const Xfer<labelListList>& constructMap,
+    labelListList&& subMap,
+    labelListList&& constructMap,
     const bool subHasFlip,
     const bool constructHasFlip
 )
@@ -166,8 +179,8 @@ Foam::mapDistribute::mapDistribute
     mapDistributeBase
     (
         constructSize,
-        subMap,
-        constructMap,
+        std::move(subMap),
+        std::move(constructMap),
         subHasFlip,
         constructHasFlip
     )
@@ -177,10 +190,10 @@ Foam::mapDistribute::mapDistribute
 Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
-    const Xfer<labelListList>& subMap,
-    const Xfer<labelListList>& constructMap,
-    const Xfer<labelListList>& transformElements,
-    const Xfer<labelList>& transformStart,
+    labelListList&& subMap,
+    labelListList&& constructMap,
+    labelListList&& transformElements,
+    labelList&& transformStart,
     const bool subHasFlip,
     const bool constructHasFlip
 )
@@ -188,20 +201,20 @@ Foam::mapDistribute::mapDistribute
     mapDistributeBase
     (
         constructSize,
-        subMap,
-        constructMap,
+        std::move(subMap),
+        std::move(constructMap),
         subHasFlip,
         constructHasFlip
     ),
-    transformElements_(transformElements),
-    transformStart_(transformStart)
+    transformElements_(std::move(transformElements)),
+    transformStart_(std::move(transformStart))
 {}
 
 
 Foam::mapDistribute::mapDistribute
 (
-    const labelList& sendProcs,
-    const labelList& recvProcs
+    const labelUList& sendProcs,
+    const labelUList& recvProcs
 )
 :
     mapDistributeBase(sendProcs, recvProcs)
@@ -467,29 +480,6 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute(const mapDistribute& map)
-:
-    mapDistributeBase(map),
-    transformElements_(map.transformElements_),
-    transformStart_(map.transformStart_)
-{}
-
-
-Foam::mapDistribute::mapDistribute(const Xfer<mapDistribute>& map)
-:
-    mapDistributeBase
-    (
-        map().constructSize_,
-        map().subMap_.xfer(),
-        map().constructMap_.xfer(),
-        map().subHasFlip(),
-        map().constructHasFlip()
-    ),
-    transformElements_(map().transformElements_.xfer()),
-    transformStart_(map().transformStart_.xfer())
-{}
-
-
 Foam::mapDistribute::mapDistribute(Istream& is)
 {
     is  >> *this;
@@ -518,19 +508,13 @@ void Foam::mapDistribute::transfer(mapDistribute& rhs)
 }
 
 
-Foam::Xfer<Foam::mapDistribute> Foam::mapDistribute::xfer()
-{
-    return xferMove(*this);
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::mapDistribute::operator=(const mapDistribute& rhs)
 {
-    // Check for assignment to self
     if (this == &rhs)
     {
+        // Avoid self-assignment
         FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
@@ -541,6 +525,16 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
 }
 
 
+void Foam::mapDistribute::operator=(mapDistribute&& rhs)
+{
+    if (this != &rhs)
+    {
+        // Avoid self-assignment
+        transfer(rhs);
+    }
+}
+
+
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index c7e14d771b..7ff14d980f 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -228,9 +228,9 @@ public:
                 List<List<Type>>& flds
             ) const
             {
-                forAll(flds, i)
+                for (List<Type>& fld : flds)
                 {
-                    operator()(vt, forward, flds[i]);
+                    operator()(vt, forward, fld);
                 }
             }
 
@@ -268,7 +268,7 @@ public:
                 List<point>& fld
             ) const
             {
-                pointField pfld(fld.xfer());
+                pointField pfld(std::move(fld));
                 if (forward)
                 {
                     fld = vt.transformPosition(pfld);
@@ -324,41 +324,49 @@ public:
         //- Construct null
         mapDistribute();
 
-        //- Construct from components
+        //- Copy construct
+        mapDistribute(const mapDistribute& map);
+
+        //- Move construct
+        mapDistribute(mapDistribute&& map);
+
+        //- Move construct from components
         mapDistribute
         (
             const label constructSize,
-            const Xfer<labelListList>& subMap,
-            const Xfer<labelListList>& constructMap,
+            labelListList&& subMap,
+            labelListList&& constructMap,
             const bool subHasFlip = false,
             const bool constructHasFlip = false
         );
 
-        //- Construct from components
+        //- Move construct from components
         mapDistribute
         (
             const label constructSize,
-            const Xfer<labelListList>& subMap,
-            const Xfer<labelListList>& constructMap,
-            const Xfer<labelListList>& transformElements,
-            const Xfer<labelList>& transformStart,
+            labelListList&& subMap,
+            labelListList&& constructMap,
+            labelListList&& transformElements,
+            labelList&& transformStart,
             const bool subHasFlip = false,
             const bool constructHasFlip = false
         );
 
         //- Construct from reverse addressing: per data item the send
-        //  processor and the receive processor. (note: data is not stored
-        //  sorted per processor so cannot use printLayout).
+        //- processor and the receive processor.
+        //
+        //  \note data are not stored per processor so cannot use printLayout.
         mapDistribute
         (
-            const labelList& sendProcs,
-            const labelList& recvProcs
+            const labelUList& sendProcs,
+            const labelUList& recvProcs
         );
 
         //- Construct from list of (possibly) remote elements in globalIndex
-        //  numbering (or -1). Determines compact numbering (see above) and
-        //  distribute map to get data into this ordering and renumbers the
-        //  elements to be in compact numbering.
+        //- numbering (or -1).
+        //  Determines compact numbering (see above) and distribute map to
+        //  get data into this ordering and renumbers the elements to be in
+        //  compact numbering.
         mapDistribute
         (
             const globalIndex&,
@@ -368,8 +376,9 @@ public:
         );
 
         //- Special variant that works with the info sorted into bins
-        //  according to local indices. E.g. think cellCells where
-        //  cellCells[localCelli] is a list of global cells
+        //- according to local indices.
+        //  For example, cellCells where cellCells[localCelli] is a list of
+        //  global cells.
         mapDistribute
         (
             const globalIndex&,
@@ -379,8 +388,8 @@ public:
         );
 
         //- Construct from list of (possibly remote) untransformed elements
-        //  in globalIndex numbering (or -1) and (possibly remote)
-        //  transformded elements in globalIndexAndTransform numbering.
+        //- in globalIndex numbering (or -1) and (possibly remote)
+        //- transformed elements in globalIndexAndTransform numbering.
         //  Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
@@ -407,22 +416,15 @@ public:
             const int tag = Pstream::msgType()
         );
 
-        //- Construct by transferring parameter content
-        mapDistribute(const Xfer<mapDistribute>&);
-
-        //- Construct copy
-        mapDistribute(const mapDistribute&);
-
         //- Construct from Istream
-        mapDistribute(Istream&);
+        mapDistribute(Istream& is);
 
         //- Clone
         autoPtr<mapDistribute> clone() const;
 
 
     //- Destructor
-    virtual ~mapDistribute()
-    {}
+    virtual ~mapDistribute() = default;
 
 
     // Member Functions
@@ -449,10 +451,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistribute&);
-
-            //- Transfer contents to the Xfer container
-            Xfer<mapDistribute> xfer();
+            void transfer(mapDistribute& map);
 
             //- Distribute data using default commsType.
             template<class T>
@@ -550,7 +549,12 @@ public:
 
     // Member Operators
 
-        void operator=(const mapDistribute&);
+        //- Copy assignment
+        void operator=(const mapDistribute& rhs);
+
+        //- Move assignment
+        void operator=(mapDistribute&& rhs);
+
 
     // IOstream operators
 
@@ -559,6 +563,7 @@ public:
 
         //- Write dictionary to Ostream
         friend Ostream& operator<<(Ostream&, const mapDistribute&);
+
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
index 9968377c54..82e425da95 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
@@ -282,7 +282,7 @@ void Foam::mapDistributeBase::printLayout(Ostream& os) const
 void Foam::mapDistributeBase::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
-    const labelList& elements,
+    const labelUList& elements,
     List<Map<label>>& compactMap
 ) const
 {
@@ -491,7 +491,6 @@ void Foam::mapDistributeBase::exchangeAddressing
     }
 
 
-
     // Find out what to receive/send in compact addressing.
 
     // What I want to receive is what others have to send
@@ -559,18 +558,38 @@ Foam::mapDistributeBase::mapDistributeBase()
 {}
 
 
+
+Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
+:
+    constructSize_(map.constructSize_),
+    subMap_(map.subMap_),
+    constructMap_(map.constructMap_),
+    subHasFlip_(map.subHasFlip_),
+    constructHasFlip_(map.constructHasFlip_),
+    schedulePtr_()
+{}
+
+
+Foam::mapDistributeBase::mapDistributeBase(mapDistributeBase&& map)
+:
+    mapDistributeBase()
+{
+    transfer(map);
+}
+
+
 Foam::mapDistributeBase::mapDistributeBase
 (
     const label constructSize,
-    const Xfer<labelListList>& subMap,
-    const Xfer<labelListList>& constructMap,
+    labelListList&& subMap,
+    labelListList&& constructMap,
     const bool subHasFlip,
     const bool constructHasFlip
 )
 :
     constructSize_(constructSize),
-    subMap_(subMap),
-    constructMap_(constructMap),
+    subMap_(std::move(subMap)),
+    constructMap_(std::move(constructMap)),
     subHasFlip_(subHasFlip),
     constructHasFlip_(constructHasFlip),
     schedulePtr_()
@@ -579,8 +598,8 @@ Foam::mapDistributeBase::mapDistributeBase
 
 Foam::mapDistributeBase::mapDistributeBase
 (
-    const labelList& sendProcs,
-    const labelList& recvProcs
+    const labelUList& sendProcs,
+    const labelUList& recvProcs
 )
 :
     constructSize_(0),
@@ -602,8 +621,8 @@ Foam::mapDistributeBase::mapDistributeBase
 
     forAll(sendProcs, sampleI)
     {
-        label sendProc = sendProcs[sampleI];
-        label recvProc = recvProcs[sampleI];
+        const label sendProc = sendProcs[sampleI];
+        const label recvProc = recvProcs[sampleI];
 
         // Note that also need to include local communication (both
         // RecvProc and sendProc on local processor)
@@ -632,8 +651,8 @@ Foam::mapDistributeBase::mapDistributeBase
 
     forAll(sendProcs, sampleI)
     {
-        label sendProc = sendProcs[sampleI];
-        label recvProc = recvProcs[sampleI];
+        const label sendProc = sendProcs[sampleI];
+        const label recvProc = recvProcs[sampleI];
 
         if (Pstream::myProcNo() == sendProc)
         {
@@ -681,7 +700,7 @@ Foam::mapDistributeBase::mapDistributeBase
     //    {
     //        Map<label>& globalMap = compactMap[proci];
     //
-    //        SortableList<label> sorted(globalMap.toc().xfer());
+    //        const List<label> sorted(globalMap.sortedToc());
     //
     //        forAll(sorted, i)
     //        {
@@ -741,7 +760,7 @@ Foam::mapDistributeBase::mapDistributeBase
     //    {
     //        Map<label>& globalMap = compactMap[proci];
     //
-    //        SortableList<label> sorted(globalMap.toc().xfer());
+    //        const List<label> sorted(globalMap.sortedToc());
     //
     //        forAll(sorted, i)
     //        {
@@ -771,28 +790,6 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
-:
-    constructSize_(map.constructSize_),
-    subMap_(map.subMap_),
-    constructMap_(map.constructMap_),
-    subHasFlip_(map.subHasFlip_),
-    constructHasFlip_(map.constructHasFlip_),
-    schedulePtr_()
-{}
-
-
-Foam::mapDistributeBase::mapDistributeBase(const Xfer<mapDistributeBase>& map)
-:
-    constructSize_(map().constructSize_),
-    subMap_(map().subMap_.xfer()),
-    constructMap_(map().constructMap_.xfer()),
-    subHasFlip_(map().subHasFlip_),
-    constructHasFlip_(map().constructHasFlip_),
-    schedulePtr_()
-{}
-
-
 Foam::mapDistributeBase::mapDistributeBase(Istream& is)
 {
     is >> *this;
@@ -809,12 +806,10 @@ void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
     subHasFlip_ = rhs.subHasFlip_;
     constructHasFlip_ = rhs.constructHasFlip_;
     schedulePtr_.clear();
-}
 
-
-Foam::Xfer<Foam::mapDistributeBase> Foam::mapDistributeBase::xfer()
-{
-    return xferMove(*this);
+    rhs.constructSize_ = 0;
+    rhs.subHasFlip_ = false;
+    rhs.constructHasFlip_ = false;
 }
 
 
@@ -1228,9 +1223,9 @@ void Foam::mapDistributeBase::compact
 
 void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
 {
-    // Check for assignment to self
     if (this == &rhs)
     {
+        // Avoid self assignment
         FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
@@ -1244,6 +1239,16 @@ void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
 }
 
 
+void Foam::mapDistributeBase::operator=(mapDistributeBase&& rhs)
+{
+    if (this != &rhs)
+    {
+        // Avoid self assignment
+        transfer(rhs);
+    }
+}
+
+
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
index 83d99861f7..215d452be8 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -139,7 +139,7 @@ protected:
         void calcCompactAddressing
         (
             const globalIndex& globalNumbering,
-            const labelList& elements,
+            const labelUList& elements,
             List<Map<label>>& compactMap
         ) const;
 
@@ -198,12 +198,18 @@ public:
         //- Construct null
         mapDistributeBase();
 
+        //- Copy construct
+        mapDistributeBase(const mapDistributeBase& map);
+
+        //- Move construct
+        mapDistributeBase(mapDistributeBase&& map);
+
         //- Construct from components
         mapDistributeBase
         (
             const label constructSize,
-            const Xfer<labelListList>& subMap,
-            const Xfer<labelListList>& constructMap,
+            labelListList&& subMap,
+            labelListList&& constructMap,
             const bool subHasFlip = false,
             const bool constructHasFlip = false
         );
@@ -213,8 +219,8 @@ public:
         //  sorted per processor so cannot use printLayout).
         mapDistributeBase
         (
-            const labelList& sendProcs,
-            const labelList& recvProcs
+            const labelUList& sendProcs,
+            const labelUList& recvProcs
         );
 
         //- Construct from list of (possibly) remote elements in globalIndex
@@ -240,14 +246,8 @@ public:
             const int tag = Pstream::msgType()
         );
 
-        //- Construct by transferring parameter content
-        mapDistributeBase(const Xfer<mapDistributeBase>&);
-
-        //- Construct copy
-        mapDistributeBase(const mapDistributeBase&);
-
         //- Construct from Istream
-        mapDistributeBase(Istream&);
+        mapDistributeBase(Istream& is);
 
 
     // Member Functions
@@ -329,10 +329,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributeBase&);
-
-            //- Transfer contents to the Xfer container
-            Xfer<mapDistributeBase> xfer();
+            void transfer(mapDistributeBase& rhs);
 
             //- Helper for construct from globalIndex. Renumbers element
             //  (in globalIndex numbering) into compact indices.
@@ -464,9 +461,15 @@ public:
                 NotImplemented;
             }
 
+
     // Member Operators
 
-        void operator=(const mapDistributeBase&);
+        //- Copy assigment
+        void operator=(const mapDistributeBase& rhs);
+
+        //- Move assigment
+        void operator=(mapDistributeBase&& rhs);
+
 
     // IOstream operators
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
index 6bce7d6ccd..6d4dc90e75 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
@@ -25,10 +25,7 @@ Class
     Foam::mapDistributeLagrangian
 
 Description
-    Class containing mesh-to-mesh mapping information for particles
-
-SourceFiles
-    mapDistributeLagrangian.C
+    Mesh-to-mesh mapping information for particles
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,12 +42,12 @@ namespace Foam
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class mapDistributeLagrangian Declaration
+                   Class mapDistributeLagrangian Declaration
 \*---------------------------------------------------------------------------*/
 
 class mapDistributeLagrangian
 {
-    // Private data
+    // Private Data
 
         //- Map to distribute particles
         const mapDistribute particleMap_;
@@ -63,17 +60,22 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Move construct from components
         mapDistributeLagrangian
         (
             const label nNewParticles,
-            const Xfer<labelListList>& subParticleMap,
-            const Xfer<labelListList>& constructParticleMap,
-            const Xfer<labelListList>& constructCellLabels
+            labelListList&& subParticleMap,
+            labelListList&& constructParticleMap,
+            labelListList&& constructCellLabels
         )
         :
-            particleMap_(nNewParticles, subParticleMap, constructParticleMap),
-            constructCellLabels_(constructCellLabels)
+            particleMap_
+            (
+                nNewParticles,
+                std::move(subParticleMap),
+                std::move(constructParticleMap)
+            ),
+            constructCellLabels_(std::move(constructCellLabels))
         {}
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
index 3ad711b0ab..9e67b5ec29 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,6 +73,17 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh()
 {}
 
 
+Foam::mapDistributePolyMesh::mapDistributePolyMesh
+(
+    mapDistributePolyMesh&& map
+)
+:
+    mapDistributePolyMesh()
+{
+    transfer(map);
+}
+
+
 Foam::mapDistributePolyMesh::mapDistributePolyMesh
 (
     const polyMesh& mesh,
@@ -81,20 +92,20 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     const label nOldPoints,
     const label nOldFaces,
     const label nOldCells,
-    const Xfer<labelList>& oldPatchStarts,
-    const Xfer<labelList>& oldPatchNMeshPoints,
+    labelList&& oldPatchStarts,
+    labelList&& oldPatchNMeshPoints,
 
     // how to subset pieces of mesh to send across
-    const Xfer<labelListList>& subPointMap,
-    const Xfer<labelListList>& subFaceMap,
-    const Xfer<labelListList>& subCellMap,
-    const Xfer<labelListList>& subPatchMap,
+    labelListList&& subPointMap,
+    labelListList&& subFaceMap,
+    labelListList&& subCellMap,
+    labelListList&& subPatchMap,
 
     // how to reconstruct received mesh
-    const Xfer<labelListList>& constructPointMap,
-    const Xfer<labelListList>& constructFaceMap,
-    const Xfer<labelListList>& constructCellMap,
-    const Xfer<labelListList>& constructPatchMap,
+    labelListList&& constructPointMap,
+    labelListList&& constructFaceMap,
+    labelListList&& constructCellMap,
+    labelListList&& constructPatchMap,
 
     const bool subFaceHasFlip,
     const bool constructFaceHasFlip
@@ -103,20 +114,35 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     nOldPoints_(nOldPoints),
     nOldFaces_(nOldFaces),
     nOldCells_(nOldCells),
-    oldPatchSizes_(oldPatchStarts().size()),
-    oldPatchStarts_(oldPatchStarts),
-    oldPatchNMeshPoints_(oldPatchNMeshPoints),
-    pointMap_(mesh.nPoints(), subPointMap, constructPointMap),
+    oldPatchSizes_(oldPatchStarts.size()),
+    oldPatchStarts_(std::move(oldPatchStarts)),
+    oldPatchNMeshPoints_(std::move(oldPatchNMeshPoints)),
+    pointMap_
+    (
+        mesh.nPoints(),
+        std::move(subPointMap),
+        std::move(constructPointMap)
+    ),
     faceMap_
     (
         mesh.nFaces(),
-        subFaceMap,
-        constructFaceMap,
+        std::move(subFaceMap),
+        std::move(constructFaceMap),
         subFaceHasFlip,
         constructFaceHasFlip
     ),
-    cellMap_(mesh.nCells(), subCellMap, constructCellMap),
-    patchMap_(mesh.boundaryMesh().size(), subPatchMap, constructPatchMap)
+    cellMap_
+    (
+        mesh.nCells(),
+        std::move(subCellMap),
+        std::move(constructCellMap)
+    ),
+    patchMap_
+    (
+        mesh.boundaryMesh().size(),
+        std::move(subPatchMap),
+        std::move(constructPatchMap)
+    )
 {
     calcPatchSizes();
 }
@@ -128,49 +154,31 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     const label nOldPoints,
     const label nOldFaces,
     const label nOldCells,
-    const Xfer<labelList>& oldPatchStarts,
-    const Xfer<labelList>& oldPatchNMeshPoints,
+    labelList&& oldPatchStarts,
+    labelList&& oldPatchNMeshPoints,
 
     // how to transfer pieces of mesh
-    const Xfer<mapDistribute>& pointMap,
-    const Xfer<mapDistribute>& faceMap,
-    const Xfer<mapDistribute>& cellMap,
-    const Xfer<mapDistribute>& patchMap
+    mapDistribute&& pointMap,
+    mapDistribute&& faceMap,
+    mapDistribute&& cellMap,
+    mapDistribute&& patchMap
 )
 :
     nOldPoints_(nOldPoints),
     nOldFaces_(nOldFaces),
     nOldCells_(nOldCells),
-    oldPatchSizes_(oldPatchStarts().size()),
-    oldPatchStarts_(oldPatchStarts),
-    oldPatchNMeshPoints_(oldPatchNMeshPoints),
-    pointMap_(pointMap),
-    faceMap_(faceMap),
-    cellMap_(cellMap),
-    patchMap_(patchMap)
+    oldPatchSizes_(oldPatchStarts.size()),
+    oldPatchStarts_(std::move(oldPatchStarts)),
+    oldPatchNMeshPoints_(std::move(oldPatchNMeshPoints)),
+    pointMap_(std::move(pointMap)),
+    faceMap_(std::move(faceMap)),
+    cellMap_(std::move(cellMap)),
+    patchMap_(std::move(patchMap))
 {
     calcPatchSizes();
 }
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
-(
-    const Xfer<mapDistributePolyMesh>& map
-)
-:
-    nOldPoints_(map().nOldPoints_),
-    nOldFaces_(map().nOldFaces_),
-    nOldCells_(map().nOldCells_),
-    oldPatchSizes_(map().oldPatchSizes_.xfer()),
-    oldPatchStarts_(map().oldPatchStarts_.xfer()),
-    oldPatchNMeshPoints_(map().oldPatchNMeshPoints_.xfer()),
-    pointMap_(map().pointMap_.xfer()),
-    faceMap_(map().faceMap_.xfer()),
-    cellMap_(map().cellMap_.xfer()),
-    patchMap_(map().patchMap_.xfer())
-{}
-
-
 Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
 {
     is  >> *this;
@@ -191,12 +199,10 @@ void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
     faceMap_.transfer(rhs.faceMap_);
     cellMap_.transfer(rhs.cellMap_);
     patchMap_.transfer(rhs.patchMap_);
-}
 
-
-Foam::Xfer<Foam::mapDistributePolyMesh> Foam::mapDistributePolyMesh::xfer()
-{
-    return xferMove(*this);
+    rhs.nOldPoints_ = 0;
+    rhs.nOldFaces_ = 0;
+    rhs.nOldCells_ = 0;
 }
 
 
@@ -287,6 +293,12 @@ void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
 }
 
 
+void Foam::mapDistributePolyMesh::operator=(mapDistributePolyMesh&& rhs)
+{
+    transfer(rhs);
+}
+
+
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index 86e0300696..2756e15395 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,12 +48,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declarations
 class mapPolyMesh;
 class polyMesh;
-
-
-// Forward declaration of friend functions and operators
-
 class mapDistributePolyMesh;
 
 Istream& operator>>(Istream&, mapDistributePolyMesh&);
@@ -104,8 +101,8 @@ class mapDistributePolyMesh
 
         void calcPatchSizes();
 
-        //- Disallow default bitwise copy construct
-        mapDistributePolyMesh(const mapDistributePolyMesh&);
+        //- Disallow copy construct
+        mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
 
 
 public:
@@ -115,6 +112,9 @@ public:
         //- Construct null
         mapDistributePolyMesh();
 
+        //- Move construct
+        mapDistributePolyMesh(mapDistributePolyMesh&& map);
+
         //- Construct from components. Note that mesh has to be changed already
         //  since uses mesh.nPoints etc as the new size.
         mapDistributePolyMesh
@@ -125,47 +125,44 @@ public:
             const label nOldPoints,
             const label nOldFaces,
             const label nOldCells,
-            const Xfer<labelList>& oldPatchStarts,
-            const Xfer<labelList>& oldPatchNMeshPoints,
+            labelList&& oldPatchStarts,
+            labelList&& oldPatchNMeshPoints,
 
             // how to subset pieces of mesh to send across
-            const Xfer<labelListList>& subPointMap,
-            const Xfer<labelListList>& subFaceMap,
-            const Xfer<labelListList>& subCellMap,
-            const Xfer<labelListList>& subPatchMap,
+            labelListList&& subPointMap,
+            labelListList&& subFaceMap,
+            labelListList&& subCellMap,
+            labelListList&& subPatchMap,
 
             // how to reconstruct received mesh
-            const Xfer<labelListList>& constructPointMap,
-            const Xfer<labelListList>& constructFaceMap,
-            const Xfer<labelListList>& constructCellMap,
-            const Xfer<labelListList>& constructPatchMap,
+            labelListList&& constructPointMap,
+            labelListList&& constructFaceMap,
+            labelListList&& constructCellMap,
+            labelListList&& constructPatchMap,
 
             const bool subFaceHasFlip = false,
             const bool constructFaceHasFlip = false
         );
 
-        //- Construct from components
+        //- Move construct from components
         mapDistributePolyMesh
         (
             // mesh before changes
             const label nOldPoints,
             const label nOldFaces,
             const label nOldCells,
-            const Xfer<labelList>& oldPatchStarts,
-            const Xfer<labelList>& oldPatchNMeshPoints,
+            labelList&& oldPatchStarts,
+            labelList&& oldPatchNMeshPoints,
 
             // how to subset pieces of mesh to send across
-            const Xfer<mapDistribute>& pointMap,
-            const Xfer<mapDistribute>& faceMap,
-            const Xfer<mapDistribute>& cellMap,
-            const Xfer<mapDistribute>& patchMap
+            mapDistribute&& pointMap,
+            mapDistribute&& faceMap,
+            mapDistribute&& cellMap,
+            mapDistribute&& patchMap
         );
 
-        //- Construct by transferring parameter content
-        mapDistributePolyMesh(const Xfer<mapDistributePolyMesh>&);
-
         //- Construct from Istream
-        mapDistributePolyMesh(Istream&);
+        mapDistributePolyMesh(Istream& is);
 
 
     // Member Functions
@@ -236,10 +233,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributePolyMesh&);
-
-            //- Transfer contents to the Xfer container
-            Xfer<mapDistributePolyMesh> xfer();
+            void transfer(mapDistributePolyMesh& map);
 
             //- Distribute list of point data
             template<class T>
@@ -285,9 +279,14 @@ public:
                 NotImplemented;
             }
 
-    // Member operators
 
-        void operator=(const mapDistributePolyMesh&);
+    // Member Operators
+
+        //- Copy assignment
+        void operator=(const mapDistributePolyMesh& map);
+
+        //- Move assignment
+        void operator=(mapDistributePolyMesh&& map);
 
 
     // IOstream operators
@@ -297,6 +296,7 @@ public:
 
         //- Write dictionary to Ostream
         friend Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
+
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 5010532693..78d3ff5cdd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -348,10 +348,10 @@ Foam::polyMesh::polyMesh(const IOobject& io)
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<labelList>& owner,
-    const Xfer<labelList>& neighbour,
+    pointField&& points,
+    faceList&& faces,
+    labelList&& owner,
+    labelList&& neighbour,
     const bool syncPar
 )
 :
@@ -368,7 +368,7 @@ Foam::polyMesh::polyMesh
             io.readOpt(),
             IOobject::AUTO_WRITE
         ),
-        points
+        std::move(points)
     ),
     faces_
     (
@@ -381,7 +381,7 @@ Foam::polyMesh::polyMesh
             io.readOpt(),
             IOobject::AUTO_WRITE
         ),
-        faces
+        std::move(faces)
     ),
     owner_
     (
@@ -394,7 +394,7 @@ Foam::polyMesh::polyMesh
             io.readOpt(),
             IOobject::AUTO_WRITE
         ),
-        owner
+        std::move(owner)
     ),
     neighbour_
     (
@@ -407,7 +407,7 @@ Foam::polyMesh::polyMesh
             io.readOpt(),
             IOobject::AUTO_WRITE
         ),
-        neighbour
+        std::move(neighbour)
     ),
     clearedPrimitives_(false),
     boundary_
@@ -500,9 +500,9 @@ Foam::polyMesh::polyMesh
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<cellList>& cells,
+    pointField&& points,
+    faceList&& faces,
+    cellList&& cells,
     const bool syncPar
 )
 :
@@ -519,7 +519,7 @@ Foam::polyMesh::polyMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        points
+        std::move(points)
     ),
     faces_
     (
@@ -532,7 +532,7 @@ Foam::polyMesh::polyMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        faces
+        std::move(faces)
     ),
     owner_
     (
@@ -643,8 +643,8 @@ Foam::polyMesh::polyMesh
         }
     }
 
-    // transfer in cell list
-    cellList cLst(cells);
+    // Transfer in cell list
+    cellList cLst(std::move(cells));
 
     // Check if cells are valid
     forAll(cLst, celli)
@@ -665,14 +665,20 @@ Foam::polyMesh::polyMesh
 }
 
 
+Foam::polyMesh::polyMesh(const IOobject& io, const zero, const bool syncPar)
+:
+    polyMesh(io, pointField(), faceList(), labelList(), labelList(), syncPar)
+{}
+
+
 void Foam::polyMesh::resetPrimitives
 (
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<labelList>& owner,
-    const Xfer<labelList>& neighbour,
-    const labelList& patchSizes,
-    const labelList& patchStarts,
+    autoPtr<pointField>&& points,
+    autoPtr<faceList>&& faces,
+    autoPtr<labelList>&& owner,
+    autoPtr<labelList>&& neighbour,
+    const labelUList& patchSizes,
+    const labelUList& patchStarts,
     const bool validBoundary
 )
 {
@@ -681,23 +687,23 @@ void Foam::polyMesh::resetPrimitives
 
     // Take over new primitive data.
     // Optimized to avoid overwriting data at all
-    if (notNull(points))
+    if (points.valid())
     {
         points_.transfer(points());
         bounds_ = boundBox(points_, validBoundary);
     }
 
-    if (notNull(faces))
+    if (faces.valid())
     {
         faces_.transfer(faces());
     }
 
-    if (notNull(owner))
+    if (owner.valid())
     {
         owner_.transfer(owner());
     }
 
-    if (notNull(neighbour))
+    if (neighbour.valid())
     {
         neighbour_.transfer(neighbour());
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 00ff5aa2f9..eaed2f1244 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -190,10 +190,10 @@ private:
     // Private Member Functions
 
         //- Disallow construct as copy
-        polyMesh(const polyMesh&);
+        polyMesh(const polyMesh&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const polyMesh&);
+        void operator=(const polyMesh&) = delete;
 
         //- Initialise the polyMesh from the primitive data
         void initMesh();
@@ -315,18 +315,22 @@ public:
 
     // Constructors
 
-        //- Construct from IOobject
+        //- Read construct from IOobject
         explicit polyMesh(const IOobject& io);
 
+        //- Construct from IOobject or as zero-sized mesh
+        //  Boundary is added using addPatches() member function
+        polyMesh(const IOobject& io, const zero, bool syncPar=true);
+
         //- Construct from IOobject or from components.
         //  Boundary is added using addPatches() member function
         polyMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<labelList>& owner,
-            const Xfer<labelList>& neighbour,
+            pointField&& points,
+            faceList&& faces,
+            labelList&& owner,
+            labelList&& neighbour,
             const bool syncPar = true
         );
 
@@ -335,9 +339,9 @@ public:
         polyMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<cellList>& cells,
+            pointField&& points,
+            faceList&& faces,
+            cellList&& cells,
             const bool syncPar = true
         );
 
@@ -345,7 +349,7 @@ public:
         polyMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
+            pointField&& points,
             const cellShapeList& shapes,
             const faceListList& boundaryFaces,
             const wordList& boundaryPatchNames,
@@ -356,12 +360,12 @@ public:
             const bool syncPar = true
         );
 
-        //- Construct from cell shapes with patch information in dictionary
-        //  format.
+        //- Construct from cell shapes, with patch information in dictionary
+        //- format.
         polyMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
+            pointField&& points,
             const cellShapeList& shapes,
             const faceListList& boundaryFaces,
             const wordList& boundaryPatchNames,
@@ -582,14 +586,18 @@ public:
             //- Reset mesh primitive data. Assumes all patch info correct
             //  (so does e.g. parallel communication). If not use
             //  validBoundary=false
+            //
+            // \note Only autoPtr parameters that test as valid() are used
+            //    for resetting, otherwise the existing entries are left
+            //    untouched.
             void resetPrimitives
             (
-                const Xfer<pointField>& points,
-                const Xfer<faceList>& faces,
-                const Xfer<labelList>& owner,
-                const Xfer<labelList>& neighbour,
-                const labelList& patchSizes,
-                const labelList& patchStarts,
+                autoPtr<pointField>&& points,
+                autoPtr<faceList>&& faces,
+                autoPtr<labelList>&& owner,
+                autoPtr<labelList>&& neighbour,
+                const labelUList& patchSizes,
+                const labelUList& patchStarts,
                 const bool validBoundary = true
             );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 65eeb613a4..60d908264d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -389,7 +389,7 @@ void Foam::polyMesh::setTopology
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
+    pointField&& points,
     const cellShapeList& cellsAsShapes,
     const faceListList& boundaryFaces,
     const wordList& boundaryPatchNames,
@@ -413,7 +413,7 @@ Foam::polyMesh::polyMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        points
+        std::move(points)
     ),
     faces_
     (
@@ -671,7 +671,7 @@ Foam::polyMesh::polyMesh
 Foam::polyMesh::polyMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
+    pointField&& points,
     const cellShapeList& cellsAsShapes,
     const faceListList& boundaryFaces,
     const wordList& boundaryPatchNames,
@@ -694,7 +694,7 @@ Foam::polyMesh::polyMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        points
+        std::move(points)
     ),
     faces_
     (
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index 4790bf176b..244c560199 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,19 +83,6 @@ Foam::cellZone::cellZone
 {}
 
 
-Foam::cellZone::cellZone
-(
-    const word& name,
-    const Xfer<labelList>& addr,
-    const label index,
-    const cellZoneMesh& zm
-)
-:
-    zone(name, addr, index),
-    zoneMesh_(zm)
-{}
-
-
 Foam::cellZone::cellZone
 (
     const word& name,
@@ -135,25 +122,6 @@ Foam::cellZone::cellZone
 {}
 
 
-Foam::cellZone::cellZone
-(
-    const cellZone& origZone,
-    const Xfer<labelList>& addr,
-    const label index,
-    const cellZoneMesh& zm
-)
-:
-    zone(origZone, addr, index),
-    zoneMesh_(zm)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cellZone::~cellZone()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::cellZone::whichCell(const label globalCellID) const
@@ -201,10 +169,10 @@ void Foam::cellZone::operator=(const labelUList& addr)
 }
 
 
-void Foam::cellZone::operator=(const Xfer<labelList>& addr)
+void Foam::cellZone::operator=(labelList&& addr)
 {
     clearAddressing();
-    labelList::operator=(addr);
+    labelList::transfer(addr);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 7f6f4e9785..ac6b10a9a4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class cellZone;
 Ostream& operator<<(Ostream& os, const cellZone& zn);
@@ -130,15 +130,6 @@ public:
             const cellZoneMesh& zm
         );
 
-        //- Construct from components, transferring addressing
-        cellZone
-        (
-            const word& name,
-            const Xfer<labelList>& addr,
-            const label index,
-            const cellZoneMesh& zm
-        );
-
         //- Construct from dictionary
         cellZone
         (
@@ -168,16 +159,6 @@ public:
             const cellZoneMesh& zm
         );
 
-        //- Construct with a new index and zone mesh information, the name
-        //- of the original zone, (move) resetting the cell addressing.
-        cellZone
-        (
-            const cellZone& origZone,
-            const Xfer<labelList>& addr,
-            const label index,
-            const cellZoneMesh& zm
-        );
-
 
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<cellZone> clone(const cellZoneMesh& zm) const
@@ -212,7 +193,7 @@ public:
 
 
     //- Destructor
-    virtual ~cellZone();
+    virtual ~cellZone() = default;
 
 
     // Member Functions
@@ -246,7 +227,7 @@ public:
         void operator=(const labelUList& addr);
 
         //- Move assign addressing, clearing demand-driven data
-        void operator=(const Xfer<labelList>& addr);
+        void operator=(labelList&& addr);
 
 
     // I-O
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 895ff740c4..cd2fac95cb 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -286,14 +286,14 @@ Foam::faceZone::faceZone
 Foam::faceZone::faceZone
 (
     const word& name,
-    const Xfer<labelList>& addr,
-    const Xfer<boolList>& fm,
+    labelList&& addr,
+    boolList&& fm,
     const label index,
     const faceZoneMesh& zm
 )
 :
-    zone(name, addr, index),
-    flipMap_(fm),
+    zone(name, std::move(addr), index),
+    flipMap_(std::move(fm)),
     zoneMesh_(zm),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -348,14 +348,14 @@ Foam::faceZone::faceZone
 Foam::faceZone::faceZone
 (
     const faceZone& origZone,
-    const Xfer<labelList>& addr,
-    const Xfer<boolList>& fm,
+    labelList&& addr,
+    boolList&& fm,
     const label index,
     const faceZoneMesh& zm
 )
 :
-    zone(origZone, addr, index),
-    flipMap_(fm),
+    zone(origZone, std::move(addr), index),
+    flipMap_(std::move(fm)),
     zoneMesh_(zm),
     patchPtr_(nullptr),
     masterCellsPtr_(nullptr),
@@ -479,12 +479,12 @@ void Foam::faceZone::resetAddressing
 
 void Foam::faceZone::resetAddressing
 (
-    const Xfer<labelList>& addr,
+    labelList&& addr,
     const bool flipMapValue
 )
 {
     clearAddressing();
-    labelList::operator=(addr);
+    labelList::transfer(addr);
     setFlipMap(flipMapValue);
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 25688b3a99..50a06cc512 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -186,8 +186,8 @@ public:
         faceZone
         (
             const word& name,
-            const Xfer<labelList>& addr,
-            const Xfer<boolList>& fm,
+            labelList&& addr,
+            boolList&& fm,
             const label index,
             const faceZoneMesh& zm
         );
@@ -219,8 +219,8 @@ public:
         faceZone
         (
             const faceZone& origZone,
-            const Xfer<labelList>& addr,
-            const Xfer<boolList>& fm,
+            labelList&& addr,
+            boolList&& fm,
             const label index,
             const faceZoneMesh& zm
         );
@@ -316,7 +316,7 @@ public:
         //  Clears demand-driven data.
         virtual void resetAddressing
         (
-            const Xfer<labelList>& addr,
+            labelList&& addr,
             const bool flipMapValue
         );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index de3917f172..1ded48ffaa 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,19 +83,6 @@ Foam::pointZone::pointZone
 {}
 
 
-Foam::pointZone::pointZone
-(
-    const word& name,
-    const Xfer<labelList>& addr,
-    const label index,
-    const pointZoneMesh& zm
-)
-:
-    zone(name, addr, index),
-    zoneMesh_(zm)
-{}
-
-
 Foam::pointZone::pointZone
 (
     const word& name,
@@ -135,25 +122,6 @@ Foam::pointZone::pointZone
 {}
 
 
-Foam::pointZone::pointZone
-(
-    const pointZone& origZone,
-    const Xfer<labelList>& addr,
-    const label index,
-    const pointZoneMesh& zm
-)
-:
-    zone(origZone, addr, index),
-    zoneMesh_(zm)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::pointZone::~pointZone()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::pointZoneMesh& Foam::pointZone::zoneMesh() const
@@ -254,10 +222,10 @@ void Foam::pointZone::operator=(const labelUList& addr)
 }
 
 
-void Foam::pointZone::operator=(const Xfer<labelList>& addr)
+void Foam::pointZone::operator=(labelList&& addr)
 {
     clearAddressing();
-    labelList::operator=(addr);
+    labelList::transfer(addr);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 4979d83d38..ac11398afe 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,15 +131,6 @@ public:
             const pointZoneMesh& zm
         );
 
-        //- Construct from components, transferring contents
-        pointZone
-        (
-            const word& name,
-            const Xfer<labelList>& addr,
-            const label index,
-            const pointZoneMesh& zm
-        );
-
         //- Construct from dictionary
         pointZone
         (
@@ -169,16 +160,6 @@ public:
             const pointZoneMesh& zm
         );
 
-        //- Construct with a new index and zone mesh information from
-        //- an original zone, (move) resetting the point list.
-        pointZone
-        (
-            const pointZone& origZone,
-            const Xfer<labelList>& addr,
-            const label index,
-            const pointZoneMesh& zm
-        );
-
 
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<pointZone> clone(const pointZoneMesh& zm) const
@@ -213,7 +194,7 @@ public:
 
 
     //- Destructor
-    virtual ~pointZone();
+    virtual ~pointZone() = default;
 
 
     // Member Functions
@@ -248,7 +229,7 @@ public:
         void operator=(const labelUList& addr);
 
         //- Assign addressing, clearing demand-driven data
-        void operator=(const Xfer<labelList>& addr);
+        void operator=(labelList&& addr);
 
 
     // I-O
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index bb48949810..31af1de1a3 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -119,20 +119,6 @@ Foam::zone::zone
 {}
 
 
-Foam::zone::zone
-(
-    const word& name,
-    const Xfer<labelList>& addr,
-    const label index
-)
-:
-    labelList(addr),
-    name_(name),
-    index_(index),
-    lookupMapPtr_(nullptr)
-{}
-
-
 Foam::zone::zone
 (
     const word& name,
@@ -176,20 +162,6 @@ Foam::zone::zone
 {}
 
 
-Foam::zone::zone
-(
-    const zone& origZone,
-    const Xfer<labelList>& addr,
-    const label index
-)
-:
-    labelList(addr),
-    name_(origZone.name()),
-    index_(index),
-    lookupMapPtr_(nullptr)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::zone::~zone()
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index 7083f72e81..8d415054db 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -118,14 +118,6 @@ public:
             const label index
         );
 
-        //- Move construct from components
-        zone
-        (
-            const word& name,
-            const Xfer<labelList>& addr,
-            const label index
-        );
-
         //- Construct from dictionary
         zone
         (
@@ -153,15 +145,6 @@ public:
             const label index
         );
 
-        //- Construct given the name of the original zone (name is used)
-        //- and (move) resetting addressing and index.
-        zone
-        (
-            const zone& zn,
-            const Xfer<labelList>& addr,
-            const label index
-        );
-
 
     //- Destructor
     virtual ~zone();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
index fdff5f05c3..5cc8103d9c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
@@ -75,11 +75,11 @@ template
 Foam::PrimitivePatch<Face, FaceList, PointField, PointType>::
 PrimitivePatch
 (
-    const Xfer<FaceList<Face>>& faces,
-    const Xfer<List<PointType>>& points
+    FaceList<Face>&& faces,
+    const Field<PointType>& points
 )
 :
-    FaceList<Face>(faces),
+    FaceList<Face>(std::move(faces)),
     points_(points),
     edgesPtr_(nullptr),
     nInternalEdges_(-1),
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 6a0d07fc9a..893274dd25 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -252,11 +252,11 @@ public:
             const Field<PointType>& points
         );
 
-        //- Construct from components
+        //- Construct from components, transferring faces
         PrimitivePatch
         (
-            const Xfer<FaceList<Face>>& faces,
-            const Xfer<List<PointType>>& points
+            FaceList<Face>&& faces,
+            const Field<PointType>& points
         );
 
         //- Construct from components, reuse storage
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index 6ee6505440..dd6dcb3705 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -279,27 +279,6 @@ void Foam::primitiveMesh::reset
 }
 
 
-void Foam::primitiveMesh::reset
-(
-    const label nPoints,
-    const label nInternalFaces,
-    const label nFaces,
-    const label nCells,
-    const Xfer<cellList>& clst
-)
-{
-    reset
-    (
-        nPoints,
-        nInternalFaces,
-        nFaces,
-        nCells
-    );
-
-    cfPtr_ = new cellList(clst);
-}
-
-
 Foam::tmp<Foam::scalarField> Foam::primitiveMesh::movePoints
 (
     const pointField& newPoints,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 23dd419349..c5ed0860d0 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -473,17 +473,6 @@ public:
         );
 
 
-        //- Reset this primitiveMesh given the primitive array sizes and cells
-        void reset
-        (
-            const label nPoints,
-            const label nInternalFaces,
-            const label nFaces,
-            const label nCells,
-            const Xfer<cellList>& cells
-        );
-
-
         // Access
 
             // Mesh size parameters
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
index 0f7971c0c2..0e9761f018 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
@@ -230,14 +230,14 @@ inline void Foam::hashedWordList::operator=(std::initializer_list<word> lst)
 
 inline void Foam::hashedWordList::operator=(hashedWordList&& lst)
 {
-    wordList::operator=(std::move(static_cast<wordList&>(lst)));
+    wordList::transfer(static_cast<wordList&>(lst));
     lookup_ = std::move(lst.lookup_);
 }
 
 
 inline void Foam::hashedWordList::operator=(wordList&& lst)
 {
-    wordList::operator=(std::move(lst));
+    wordList::transfer(lst);
     rehash();
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 71a3cb01c7..b508581123 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -553,42 +553,32 @@ void Foam::epsilonWallFunctionFvPatchScalarField::manipulateMatrix
     }
 
     DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintEpsilon(weights.size());
+    DynamicList<scalar> constraintValues(weights.size());
     const labelUList& faceCells = patch().faceCells();
 
-    const DimensionedField<scalar, volMesh>& epsilon
-        = internalField();
-
-    label nConstrainedCells = 0;
-
+    const DimensionedField<scalar, volMesh>& fld = internalField();
 
     forAll(weights, facei)
     {
         // Only set the values if the weights are > tolerance
         if (weights[facei] > tolerance_)
         {
-            nConstrainedCells++;
-
-            label celli = faceCells[facei];
+            const label celli = faceCells[facei];
 
             constraintCells.append(celli);
-            constraintEpsilon.append(epsilon[celli]);
+            constraintValues.append(fld[celli]);
         }
     }
 
     if (debug)
     {
         Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
+            << ": number of constrained cells = " << constraintCells.size()
             << " out of " << patch().size()
             << endl;
     }
 
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintEpsilon.xfer())
-    );
+    matrix.setValues(constraintCells, constraintValues);
 
     fvPatchField<scalar>::manipulateMatrix(matrix);
 }
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
index 81b1ac9076..a6f3f24a79 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
@@ -38,7 +38,7 @@ namespace Foam
 
 tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::calcNut() const
 {
-    return tmp<scalarField>::New(patch().size(), 0.0);
+    return tmp<scalarField>::New(patch().size(), Zero);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 1d7db58541..dbee78a988 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -572,41 +572,32 @@ void omegaWallFunctionFvPatchScalarField::manipulateMatrix
     }
 
     DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintomega(weights.size());
+    DynamicList<scalar> constraintValues(weights.size());
     const labelUList& faceCells = patch().faceCells();
 
-    const DimensionedField<scalar, volMesh>& omega = internalField();
-
-    label nConstrainedCells = 0;
-
+    const DimensionedField<scalar, volMesh>& fld = internalField();
 
     forAll(weights, facei)
     {
         // only set the values if the weights are > tolerance
         if (weights[facei] > tolerance_)
         {
-            ++nConstrainedCells;
-
-            label celli = faceCells[facei];
+            const label celli = faceCells[facei];
 
             constraintCells.append(celli);
-            constraintomega.append(omega[celli]);
+            constraintValues.append(fld[celli]);
         }
     }
 
     if (debug)
     {
         Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
+            << ": number of constrained cells = " << constraintCells.size()
             << " out of " << patch().size()
             << endl;
     }
 
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintomega.xfer())
-    );
+    matrix.setValues(constraintCells, constraintValues);
 
     fvPatchField<scalar>::manipulateMatrix(matrix);
 }
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index b8fa67b803..afd558ec15 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -553,7 +553,7 @@ void Foam::ccm::reader::readCells
             }
         }
 
-        ccmLookupOrder.resetAddressing(addr.xfer());
+        ccmLookupOrder.resetAddressing(std::move(addr));
     }
 
 
@@ -2599,36 +2599,34 @@ Foam::autoPtr<Foam::polyMesh> Foam::ccm::reader::mesh
 
     // Construct polyMesh
     // ~~~~~~~~~~~~~~~~~~
-    autoPtr<polyMesh> mesh
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                polyMesh::defaultRegion,
-                "constant",
-                registry
-            ),
-            xferMove(points_),
-            xferMove(faces_),
-            xferMove(faceOwner_),
-            xferMove(faceNeighbour_)
-        )
+            polyMesh::defaultRegion,
+            "constant",
+            registry
+        ),
+        std::move(points_),
+        std::move(faces_),
+        std::move(faceOwner_),
+        std::move(faceNeighbour_)
     );
+    polyMesh& mesh = *meshPtr;
 
-    addPatches(mesh());
+    addPatches(mesh);
 
     // Attach cellZones based on the cellTable Id
     // any other values can be extracted later from the cellTable dictionary
-    cellTable_.addCellZones(mesh(), cellTableId_);
-    warnDuplicates("cellZones", mesh().cellZones().names());
+    cellTable_.addCellZones(mesh, cellTableId_);
+    warnDuplicates("cellZones", mesh.cellZones().names());
 
-    addFaceZones(mesh());
+    addFaceZones(mesh);
 
-    warnDuplicates("boundaries", mesh().boundaryMesh().names());
+    warnDuplicates("boundaries", mesh.boundaryMesh().names());
     clearGeom();
 
-    return mesh;
+    return meshPtr;
 }
 
 
diff --git a/src/conversion/common/reader/meshReader.C b/src/conversion/common/reader/meshReader.C
index deb60d8b52..f82e2a2620 100644
--- a/src/conversion/common/reader/meshReader.C
+++ b/src/conversion/common/reader/meshReader.C
@@ -91,22 +91,19 @@ Foam::autoPtr<Foam::polyMesh> Foam::meshReader::mesh
     createPolyBoundary();
     clearExtraStorage();
 
-    autoPtr<polyMesh> meshPtr
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                polyMesh::defaultRegion,
-                registry.time().constant(),
-                registry
-            ),
-            xferMove(points_),
-            xferMove(meshFaces_),
-            xferMove(cellPolys_)
-        )
+            polyMesh::defaultRegion,
+            registry.time().constant(),
+            registry
+        ),
+        std::move(points_),
+        std::move(meshFaces_),
+        std::move(cellPolys_)
     );
-    polyMesh& mesh = meshPtr();
+    polyMesh& mesh = *meshPtr;
 
     // Adding patches also checks the mesh
     mesh.addPatches(polyBoundaryPatches(mesh));
diff --git a/src/conversion/fire/FIREMeshReader.C b/src/conversion/fire/FIREMeshReader.C
index 0634417e66..592d03a48e 100644
--- a/src/conversion/fire/FIREMeshReader.C
+++ b/src/conversion/fire/FIREMeshReader.C
@@ -425,31 +425,29 @@ Foam::autoPtr<Foam::polyMesh> Foam::fileFormats::FIREMeshReader::mesh
 
     Info<< "Creating a polyMesh" << endl;
 
-    autoPtr<polyMesh> mesh
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
+        IOobject
         (
-            IOobject
-            (
-                polyMesh::defaultRegion,
-                "constant",
-                registry
-            ),
-            xferMove(points_),
-            xferMove(meshFaces_),
-            xferMove(owner_),
-            xferMove(neigh_)
-        )
+            polyMesh::defaultRegion,
+            "constant",
+            registry
+        ),
+        std::move(points_),
+        std::move(meshFaces_),
+        std::move(owner_),
+        std::move(neigh_)
     );
+    polyMesh& mesh = *meshPtr;
 
     // adding patches also checks the mesh
-    addPatches(mesh());
+    addPatches(mesh);
 
-    cellTable_.addCellZones(mesh(), cellTableId_);
+    cellTable_.addCellZones(mesh, cellTableId_);
 
-    // addFaceZones(mesh());
+    // addFaceZones(mesh);
 
-    return mesh;
+    return meshPtr;
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 606114c1fc..15ee6732bc 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -1328,10 +1328,10 @@ void Foam::polyDualMesh::calcDual
     // Assign to mesh.
     resetPrimitives
     (
-        xferMove(dualPoints),
-        xferMove(dualFaces),
-        xferMove(dualOwner),
-        xferMove(dualNeighbour),
+        autoPtr<pointField>::New(std::move(dualPoints)),
+        autoPtr<faceList>::New(std::move(dualFaces)),
+        autoPtr<labelList>::New(std::move(dualOwner)),
+        autoPtr<labelList>::New(std::move(dualNeighbour)),
         patchSizes,
         patchStarts
     );
@@ -1379,13 +1379,7 @@ Foam::polyDualMesh::polyDualMesh
     const labelList& featurePoints
 )
 :
-    polyMesh
-    (
-        mesh,
-        xferCopy(pointField()),// to prevent any warnings "points not allocated"
-        xferCopy(faceList()),  // to prevent any warnings "faces  not allocated"
-        xferCopy(cellList())
-    ),
+    polyMesh(mesh, Zero),
     cellPoint_
     (
         IOobject
@@ -1424,13 +1418,7 @@ Foam::polyDualMesh::polyDualMesh
     const scalar featureCos
 )
 :
-    polyMesh
-    (
-        mesh,
-        xferCopy(pointField()),// to prevent any warnings "points not allocated"
-        xferCopy(faceList()),  // to prevent any warnings "faces  not allocated"
-        xferCopy(cellList())
-    ),
+    polyMesh(mesh, Zero),
     cellPoint_
     (
         IOobject
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
index f2d3a7f4ec..34256e4dfe 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,9 +29,8 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(dynamicFvMesh, 0);
-
-defineRunTimeSelectionTable(dynamicFvMesh, IOobject);
+    defineTypeNameAndDebug(dynamicFvMesh, 0);
+    defineRunTimeSelectionTable(dynamicFvMesh, IOobject);
 }
 
 
@@ -46,20 +45,31 @@ Foam::dynamicFvMesh::dynamicFvMesh(const IOobject& io)
 Foam::dynamicFvMesh::dynamicFvMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<labelList>& allOwner,
-    const Xfer<labelList>& allNeighbour,
+    const zero,
+    const bool syncPar
+)
+:
+    fvMesh(io, Zero, syncPar)
+{}
+
+
+Foam::dynamicFvMesh::dynamicFvMesh
+(
+    const IOobject& io,
+    pointField&& points,
+    faceList&& faces,
+    labelList&& allOwner,
+    labelList&& allNeighbour,
     const bool syncPar
 )
 :
     fvMesh
     (
         io,
-        points,
-        faces,
-        allOwner,
-        allNeighbour,
+        std::move(points),
+        std::move(faces),
+        std::move(allOwner),
+        std::move(allNeighbour),
         syncPar
     )
 {}
@@ -68,27 +78,21 @@ Foam::dynamicFvMesh::dynamicFvMesh
 Foam::dynamicFvMesh::dynamicFvMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<cellList>& cells,
+    pointField&& points,
+    faceList&& faces,
+    cellList&& cells,
     const bool syncPar
 )
 :
     fvMesh
     (
         io,
-        points,
-        faces,
-        cells,
+        std::move(points),
+        std::move(faces),
+        std::move(cells),
         syncPar
     )
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dynamicFvMesh::~dynamicFvMesh()
-{}
-
-
 // ************************************************************************* //
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index 1b88deb374..a65a8160b7 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,11 +57,11 @@ class dynamicFvMesh
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        dynamicFvMesh(const dynamicFvMesh&);
+        //- Disallow copy construct
+        dynamicFvMesh(const dynamicFvMesh&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const dynamicFvMesh&);
+        //- Disallow copy assignment
+        void operator=(const dynamicFvMesh&) = delete;
 
 
 public:
@@ -87,15 +87,19 @@ public:
         //- Construct from objectRegistry, and read/write options
         explicit dynamicFvMesh(const IOobject& io);
 
+        //- Construct from components without boundary.
+        //  Boundary is added using addFvPatches() member function
+        dynamicFvMesh(const IOobject& io, const zero, const bool syncPar=true);
+
         //- Construct from components without boundary.
         //  Boundary is added using addFvPatches() member function
         dynamicFvMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<labelList>& allOwner,
-            const Xfer<labelList>& allNeighbour,
+            pointField&& points,
+            faceList&& faces,
+            labelList&& allOwner,
+            labelList&& allNeighbour,
             const bool syncPar = true
         );
 
@@ -104,9 +108,9 @@ public:
         dynamicFvMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<cellList>& cells,
+            pointField&& points,
+            faceList&& faces,
+            cellList&& cells,
             const bool syncPar = true
         );
 
@@ -118,7 +122,7 @@ public:
 
 
     //- Destructor
-    virtual ~dynamicFvMesh();
+    virtual ~dynamicFvMesh() = default;
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.C b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.C
index d13c00b38e..172b2565f9 100644
--- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.C
+++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.C
@@ -26,8 +26,6 @@ License
 #include "staticFvMesh.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -45,12 +43,6 @@ Foam::staticFvMesh::staticFvMesh(const IOobject& io)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::staticFvMesh::~staticFvMesh()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::staticFvMesh::update()
diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
index bbbf1201b2..88120aef5c 100644
--- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
+++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
@@ -72,7 +72,7 @@ public:
 
 
     //- Destructor
-    ~staticFvMesh();
+    ~staticFvMesh() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 3f03825504..d69b26e89f 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -63,10 +63,7 @@ extrudePatchMesh::extrudePatchMesh
             IOobject::NO_WRITE,
             true
         ),
-        xferCopy(pointField()),
-        xferCopy(faceList()),
-        xferCopy(labelList()),
-        xferCopy(labelList()),
+        Zero,
         false
     ),
     extrudedPatch_(patch.patch()),
@@ -95,16 +92,12 @@ extrudePatchMesh::extrudePatchMesh
             IOobject::NO_WRITE,
             true
         ),
-        xferCopy(pointField()),
-        xferCopy(faceList()),
-        xferCopy(labelList()),
-        xferCopy(labelList()),
+        Zero,
         false
     ),
     extrudedPatch_(patch.patch()),
     dict_(dict)
 {
-
     List<polyPatch*> regionPatches(3);
     List<word> patchNames(regionPatches.size());
     List<word> patchTypes(regionPatches.size());
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
index 210e5e4750..f572884551 100644
--- a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
+++ b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
@@ -87,10 +87,32 @@ Foam::IOmapDistributePolyMesh::IOmapDistributePolyMesh
 }
 
 
-// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+Foam::IOmapDistributePolyMesh::IOmapDistributePolyMesh
+(
+    const IOobject& io,
+    mapDistributePolyMesh&& map
+)
+:
+    regIOobject(io)
+{
+    // Warn for MUST_READ_IF_MODIFIED
+    warnNoRereading<IOmapDistributePolyMesh>();
 
-Foam::IOmapDistributePolyMesh::~IOmapDistributePolyMesh()
-{}
+    mapDistributePolyMesh::transfer(map);
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
index 5b0ad1befb..b17ab7660c 100644
--- a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
+++ b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
@@ -63,23 +63,34 @@ public:
     // Constructors
 
         //- Construct given an IOobject
-        IOmapDistributePolyMesh(const IOobject&);
+        IOmapDistributePolyMesh(const IOobject& io);
 
         //- Construct given an IOobject and mapDistributePolyMesh
-        IOmapDistributePolyMesh(const IOobject&, const mapDistributePolyMesh&);
+        IOmapDistributePolyMesh
+        (
+            const IOobject& io,
+            const mapDistributePolyMesh& map
+        );
+
+        //- Construct given an IOobject and mapDistributePolyMesh
+        IOmapDistributePolyMesh
+        (
+            const IOobject& io,
+            mapDistributePolyMesh&& map
+        );
 
 
     //- Destructor
-    virtual ~IOmapDistributePolyMesh();
+    virtual ~IOmapDistributePolyMesh() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        //- ReadData function required for regIOobject read operation
-        virtual bool readData(Istream&);
+        //- The readData method for regIOobject read operation
+        virtual bool readData(Istream& is);
 
-        //- WriteData function required for regIOobject write operation
-        virtual bool writeData(Ostream&) const;
+        //- The writeData method for regIOobject write operation
+        virtual bool writeData(Ostream& os) const;
 
 };
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index beb3af4346..5a3b9b649c 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1480,25 +1480,22 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshDistribute::receiveMesh
         >> domainSourceNewNbrProc;
 
     // Construct fvMesh
-    autoPtr<fvMesh> domainMeshPtr
+    auto domainMeshPtr = autoPtr<fvMesh>::New
     (
-        new fvMesh
+        IOobject
         (
-            IOobject
-            (
-                fvMesh::defaultRegion,
-                runTime.timeName(),
-                runTime,
-                IOobject::NO_READ
-            ),
-            xferMove(domainPoints),
-            xferMove(domainFaces),
-            xferMove(domainAllOwner),
-            xferMove(domainAllNeighbour),
-            false                   // no parallel comms
-        )
+            fvMesh::defaultRegion,
+            runTime.timeName(),
+            runTime,
+            IOobject::NO_READ
+        ),
+        std::move(domainPoints),
+        std::move(domainFaces),
+        std::move(domainAllOwner),
+        std::move(domainAllNeighbour),
+        false                   // no parallel comms
     );
-    fvMesh& domainMesh = domainMeshPtr();
+    fvMesh& domainMesh = *domainMeshPtr;
 
     List<polyPatch*> patches(patchEntries.size());
 
@@ -1641,28 +1638,25 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     if (!Pstream::parRun())
     {
         // Collect all maps and return
-        return autoPtr<mapDistributePolyMesh>
+        return autoPtr<mapDistributePolyMesh>::New
         (
-            new mapDistributePolyMesh
-            (
-                mesh_,
+            mesh_,
 
-                nOldPoints,
-                nOldFaces,
-                nOldCells,
-                oldPatchStarts.xfer(),
-                oldPatchNMeshPoints.xfer(),
+            nOldPoints,
+            nOldFaces,
+            nOldCells,
+            std::move(oldPatchStarts),
+            std::move(oldPatchNMeshPoints),
 
-                labelListList(1, identity(mesh_.nPoints())).xfer(),//subPointMap
-                labelListList(1, identity(mesh_.nFaces())).xfer(), //subFaceMap
-                labelListList(1, identity(mesh_.nCells())).xfer(), //subCellMap
-                labelListList(1, identity(patches.size())).xfer(), //subPatchMap
+            labelListList(one(), identity(mesh_.nPoints())), //subPointMap
+            labelListList(one(), identity(mesh_.nFaces())),  //subFaceMap
+            labelListList(one(), identity(mesh_.nCells())),  //subCellMap
+            labelListList(one(), identity(patches.size())),  //subPatchMap
 
-                labelListList(1, identity(mesh_.nPoints())).xfer(),//pointMap
-                labelListList(1, identity(mesh_.nFaces())).xfer(), //faceMap
-                labelListList(1, identity(mesh_.nCells())).xfer(), //cellMap
-                labelListList(1, identity(patches.size())).xfer()  //patchMap
-            )
+            labelListList(one(), identity(mesh_.nPoints())), //pointMap
+            labelListList(one(), identity(mesh_.nFaces())),  //faceMap
+            labelListList(one(), identity(mesh_.nCells())),  //cellMap
+            labelListList(one(), identity(patches.size()))   //patchMap
         );
     }
 
@@ -1861,8 +1855,6 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     labelListList constructPatchMap(Pstream::nProcs());
 
 
-
-
     // Find out schedule
     // ~~~~~~~~~~~~~~~~~
 
@@ -2723,31 +2715,28 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     }
 
     // Collect all maps and return
-    return autoPtr<mapDistributePolyMesh>
+    return autoPtr<mapDistributePolyMesh>::New
     (
-        new mapDistributePolyMesh
-        (
-            mesh_,
+        mesh_,
 
-            nOldPoints,
-            nOldFaces,
-            nOldCells,
-            oldPatchStarts.xfer(),
-            oldPatchNMeshPoints.xfer(),
+        nOldPoints,
+        nOldFaces,
+        nOldCells,
+        std::move(oldPatchStarts),
+        std::move(oldPatchNMeshPoints),
 
-            subPointMap.xfer(),
-            subFaceMap.xfer(),
-            subCellMap.xfer(),
-            subPatchMap.xfer(),
+        std::move(subPointMap),
+        std::move(subFaceMap),
+        std::move(subCellMap),
+        std::move(subPatchMap),
 
-            constructPointMap.xfer(),
-            constructFaceMap.xfer(),
-            constructCellMap.xfer(),
-            constructPatchMap.xfer(),
+        std::move(constructPointMap),
+        std::move(constructFaceMap),
+        std::move(constructCellMap),
+        std::move(constructPatchMap),
 
-            true,           // subFaceMap has flip
-            true            // constructFaceMap has flip
-        )
+        true,           // subFaceMap has flip
+        true            // constructFaceMap has flip
     );
 }
 
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 5e83a25098..77a8840d48 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -708,25 +708,23 @@ void Foam::fvMeshSubset::setCellSubset
     }
 
 
-    // Delete any old mesh
+    // Delete any old mesh first
     fvMeshSubsetPtr_.clear();
+
     // Make a new mesh
-    fvMeshSubsetPtr_.reset
+    fvMeshSubsetPtr_ = autoPtr<fvMesh>::New
     (
-        new fvMesh
+        IOobject
         (
-            IOobject
-            (
-                baseMesh().name() + "SubSet",
-                baseMesh().time().timeName(),
-                baseMesh().time(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            xferMove(newPoints),
-            xferMove(newFaces),
-            xferMove(newCells)
-        )
+            baseMesh().name() + "SubSet",
+            baseMesh().time().timeName(),
+            baseMesh().time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        std::move(newPoints),
+        std::move(newFaces),
+        std::move(newCells)
     );
 
 
@@ -1207,23 +1205,20 @@ void Foam::fvMeshSubset::setLargeCellSubset
     // cannot find its fvSchemes (it will try to read e.g.
     // system/region0SubSet/fvSchemes)
     // Make a new mesh
-    fvMeshSubsetPtr_.reset
+    fvMeshSubsetPtr_ = autoPtr<fvMesh>::New
     (
-        new fvMesh
+        IOobject
         (
-            IOobject
-            (
-                baseMesh().name(),
-                baseMesh().time().timeName(),
-                baseMesh().time(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            xferMove(newPoints),
-            xferMove(newFaces),
-            xferMove(newCells),
-            syncPar           // parallel synchronisation
-        )
+            baseMesh().name(),
+            baseMesh().time().timeName(),
+            baseMesh().time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        std::move(newPoints),
+        std::move(newFaces),
+        std::move(newCells),
+        syncPar           // parallel synchronisation
     );
 
     // Add old patches
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
index 285674ec11..e6152f24dc 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
@@ -532,18 +532,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshTools::newMesh
         regIOobject::fileModificationChecking;
     regIOobject::fileModificationChecking = regIOobject::timeStamp;
 
-    autoPtr<fvMesh> meshPtr
-    (
-        new fvMesh
-        (
-            meshIO,
-            xferCopy(pointField()),
-            xferCopy(faceList()),
-            xferCopy(labelList()),
-            xferCopy(labelList())
-        )
-    );
-    fvMesh& mesh = meshPtr();
+    auto meshPtr = autoPtr<fvMesh>::New(meshIO, Zero);
+    fvMesh& mesh = *meshPtr;
 
     regIOobject::fileModificationChecking = oldCheckType;
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index ccb13f30a7..435314e6a2 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -111,7 +111,7 @@ Foam::points0MotionSolver::points0MotionSolver
 )
 :
     motionSolver(mesh, dict, type),
-    points0_(pointIOField(points0IO(mesh)))
+    points0_(points0IO(mesh))
 {
     if (points0_.size() != mesh.nPoints())
     {
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index c3ce66f3a2..1f2d3b0f26 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -1645,18 +1645,15 @@ Foam::autoPtr<Foam::polyMesh> Foam::polyMeshAdder::add
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Construct mesh
-    autoPtr<polyMesh> tmesh
+    auto meshPtr = autoPtr<polyMesh>::New
     (
-        new polyMesh
-        (
-            io,
-            xferMove(allPoints),
-            xferMove(allFaces),
-            xferMove(allOwner),
-            xferMove(allNeighbour)
-        )
+        io,
+        std::move(allPoints),
+        std::move(allFaces),
+        std::move(allOwner),
+        std::move(allNeighbour)
     );
-    polyMesh& mesh = tmesh();
+    polyMesh& mesh = *meshPtr;
 
     // Add zones to new mesh.
     addZones
@@ -1676,7 +1673,7 @@ Foam::autoPtr<Foam::polyMesh> Foam::polyMeshAdder::add
     // Add patches to new mesh
     mesh.addPatches(allPatches);
 
-    return tmesh;
+    return meshPtr;
 }
 
 
@@ -1965,10 +1962,10 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     mesh0.resetMotion();    // delete any oldPoints.
     mesh0.resetPrimitives
     (
-        xferMove(allPoints),
-        xferMove(allFaces),
-        xferMove(allOwner),
-        xferMove(allNeighbour),
+        autoPtr<pointField>::New(std::move(allPoints)),
+        autoPtr<faceList>::New(std::move(allFaces)),
+        autoPtr<labelList>::New(std::move(allOwner)),
+        autoPtr<labelList>::New(std::move(allNeighbour)),
         patchSizes,     // size
         patchStarts,    // patchstarts
         validBoundary   // boundary valid?
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 863d7dfeb9..f7908b2146 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -5089,7 +5089,7 @@ const Foam::cellShapeList& Foam::hexRef8::cellShapes() const
 
                 if (haveQuads)
                 {
-                    faceList faces(quads.xfer());
+                    faceList faces(std::move(quads));
                     cellShapesPtr_()[celli] = degenerateMatcher::match(faces);
                     nSplitHex++;
                 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 9ae35e31e7..7c5ab3a12c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3093,10 +3093,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
 
         mesh.resetPrimitives
         (
-            xferMove(renumberedMeshPoints),
-            faces_.xfer(),
-            faceOwner_.xfer(),
-            faceNeighbour_.xfer(),
+            autoPtr<pointField>::New(std::move(renumberedMeshPoints)),
+            autoPtr<faceList>::New(std::move(faces_)),
+            autoPtr<labelList>::New(std::move(faceOwner_)),
+            autoPtr<labelList>::New(std::move(faceNeighbour_)),
             patchSizes,
             patchStarts,
             syncParallel
@@ -3111,10 +3111,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
         // Set new points.
         mesh.resetPrimitives
         (
-            xferMove(newPoints),
-            faces_.xfer(),
-            faceOwner_.xfer(),
-            faceNeighbour_.xfer(),
+            autoPtr<pointField>::New(std::move(newPoints)),
+            autoPtr<faceList>::New(std::move(faces_)),
+            autoPtr<labelList>::New(std::move(faceOwner_)),
+            autoPtr<labelList>::New(std::move(faceNeighbour_)),
             patchSizes,
             patchStarts,
             syncParallel
@@ -3342,13 +3342,13 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
         new fvMesh
         (
             noReadIO,
-            xferMove(newPoints),
-            faces_.xfer(),
-            faceOwner_.xfer(),
-            faceNeighbour_.xfer()
+            std::move(newPoints),
+            std::move(faces_),
+            std::move(faceOwner_),
+            std::move(faceNeighbour_)
         )
     );
-    fvMesh& newMesh = newMeshPtr();
+    fvMesh& newMesh = *newMeshPtr;
 
     // Clear out primitives
     {
diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
index 56a398131c..ce53eaa56c 100644
--- a/src/fileFormats/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ const Foam::Enum
 <
     Foam::coordSet::coordFormat
 >
-Foam::coordSet::coordFormatNames_
+Foam::coordSet::coordFormatNames
 {
     { coordFormat::XYZ, "xyz" },
     { coordFormat::X, "x" },
@@ -64,10 +64,10 @@ Foam::coordSet::coordSet
     const word& axis
 )
 :
-    pointField(0),
+    pointField(),
     name_(name),
-    axis_(coordFormatNames_[axis]),
-    curveDist_(0)
+    axis_(coordFormatNames[axis]),
+    curveDist_()
 {}
 
 
@@ -81,13 +81,30 @@ Foam::coordSet::coordSet
 :
     pointField(points),
     name_(name),
-    axis_(coordFormatNames_[axis]),
+    axis_(coordFormatNames[axis]),
     curveDist_(curveDist)
 {
     checkDimensions();
 }
 
 
+Foam::coordSet::coordSet
+(
+    const word& name,
+    const word& axis,
+    List<point>&& points,
+    scalarList&& curveDist
+)
+:
+    pointField(std::move(points)),
+    name_(name),
+    axis_(coordFormatNames[axis]),
+    curveDist_(std::move(curveDist))
+{
+    checkDimensions();
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::coordSet::hasVectorAxis() const
@@ -122,7 +139,7 @@ Foam::scalar Foam::coordSet::scalarCoord(const label index) const
             if (curveDist_.empty())
             {
                 FatalErrorInFunction
-                    << "Axis type '" << coordFormatNames_[axis_]
+                    << "Axis type '" << coordFormatNames[axis_]
                     << "' requested but curve distance has not been set"
                     << abort(FatalError);
             }
@@ -132,7 +149,7 @@ Foam::scalar Foam::coordSet::scalarCoord(const label index) const
         default:
         {
             FatalErrorInFunction
-                << "Illegal axis specification '" << coordFormatNames_[axis_]
+                << "Illegal axis specification '" << coordFormatNames[axis_]
                 << "' for sampling line " << name_
                 << exit(FatalError);
 
@@ -152,7 +169,7 @@ Foam::point Foam::coordSet::vectorCoord(const label index) const
 
 Foam::Ostream& Foam::coordSet::write(Ostream& os) const
 {
-    os  << "name:" << name_ << " axis:" << coordFormatNames_[axis_]
+    os  << "name:" << name_ << " axis:" << coordFormatNames[axis_]
         << nl
         << nl << "\t(coord)"
         << endl;
diff --git a/src/fileFormats/coordSet/coordSet.H b/src/fileFormats/coordSet/coordSet.H
index 179e4f2adc..705f8ec694 100644
--- a/src/fileFormats/coordSet/coordSet.H
+++ b/src/fileFormats/coordSet/coordSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,12 +67,11 @@ public:
             DISTANCE
         };
 
+        //- String representation of coordFormat enum
+        static const Enum<coordFormat> coordFormatNames;
 
 private:
 
-        //- String representation of coordFormat enums
-        static const Enum<coordFormat> coordFormatNames_;
-
         //- Check for consistent dimensions of points and curve distance
         void checkDimensions() const;
 
@@ -98,7 +97,7 @@ public:
         coordSet(const word& name, const word& axis);
 
 
-        //- Construct from components
+        //- Copy construct from components
         coordSet
         (
             const word& name,
@@ -107,6 +106,15 @@ public:
             const scalarList& curveDist
         );
 
+        //- Move construct from components
+        coordSet
+        (
+            const word& name,
+            const word& axis,
+            List<point>&& points,
+            scalarList&& curveDist
+        );
+
 
     // Member functions
 
@@ -117,7 +125,7 @@ public:
 
         word axis() const
         {
-            return coordFormatNames_[axis_];
+            return coordFormatNames[axis_];
         }
 
         //- Cumulative distance
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 109b994f92..290a93e671 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -184,8 +184,8 @@ Foam::label Foam::fileFormats::STARCDCore::readPoints
     readHeader(is, HEADER_VRT);
 
     // reuse memory if possible
-    DynamicList<point> dynPoints(points.xfer());
-    DynamicList<label> dynPointId(ids.xfer());    // STAR-CD index of points
+    DynamicList<point> dynPoints(std::move(points));
+    DynamicList<label> dynPointId(std::move(ids)); // STAR-CD index of points
 
     dynPoints.clear();
     dynPointId.clear();
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
index 6439771b88..5c5a5f66c8 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
@@ -34,7 +34,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::basicSymmetryFaPatchField<Foam::scalar>::snGrad() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
index a542672135..3305085a14 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
@@ -33,7 +33,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::transformFaPatchField<Foam::scalar>::gradientInternalCoeffs() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
index 0752c8b6d2..e6cd3fc57d 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
@@ -34,7 +34,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::wedgeFaPatchField<Foam::scalar>::snGrad() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
index df339b13f8..b104b3ec7b 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
@@ -32,7 +32,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::basicSymmetryFvPatchField<Foam::scalar>::snGrad() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
index 16adba3f61..091d216c11 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
@@ -42,7 +42,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index fee3226ea8..84405f3832 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -150,12 +150,12 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     processorLduInterfaceField(),
     coupledFvPatchField<Type>(ptf),
     procPatch_(refCast<const processorFvPatch>(ptf.patch())),
-    sendBuf_(ptf.sendBuf_.xfer()),
-    receiveBuf_(ptf.receiveBuf_.xfer()),
+    sendBuf_(std::move(ptf.sendBuf_)),
+    receiveBuf_(std::move(ptf.receiveBuf_)),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
-    scalarSendBuf_(ptf.scalarSendBuf_.xfer()),
-    scalarReceiveBuf_(ptf.scalarReceiveBuf_.xfer())
+    scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
+    scalarReceiveBuf_(std::move(ptf.scalarReceiveBuf_))
 {
     if (debug && !ptf.ready())
     {
@@ -191,13 +191,6 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 }
 
 
-// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::processorFvPatchField<Type>::~processorFvPatchField()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 11013c8824..e1a5ff2aae 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -164,7 +164,7 @@ public:
 
 
     //- Destructor
-    ~processorFvPatchField();
+    ~processorFvPatchField() = default;
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
index 8a330b9b7e..cbafebcc50 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
@@ -32,7 +32,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::symmetryPlaneFvPatchField<Foam::scalar>::snGrad() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
index 4a95611c80..f83aa7e32b 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
@@ -36,7 +36,7 @@ namespace Foam
 template<>
 tmp<scalarField> wedgeFvPatchField<scalar>::snGrad() const
 {
-    return tmp<scalarField>::New(size(), 0.0);
+    return tmp<scalarField>::New(size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index a23ffef19f..7470b9856e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -683,7 +683,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::calcOverlappingProcEddies
         }
     }
 
-    mapDistribute map(segmentI, sendMap.xfer(), constructMap.xfer());
+    mapDistribute map(segmentI, std::move(sendMap), std::move(constructMap));
 
     PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 6a15c27d8f..a0a032935b 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.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) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -336,14 +336,22 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 Foam::fvMesh::fvMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<labelList>& allOwner,
-    const Xfer<labelList>& allNeighbour,
+    pointField&& points,
+    faceList&& faces,
+    labelList&& allOwner,
+    labelList&& allNeighbour,
     const bool syncPar
 )
 :
-    polyMesh(io, points, faces, allOwner, allNeighbour, syncPar),
+    polyMesh
+    (
+        io,
+        std::move(points),
+        std::move(faces),
+        std::move(allOwner),
+        std::move(allNeighbour),
+        syncPar
+    ),
     surfaceInterpolation(*this),
     fvSchemes(static_cast<const objectRegistry&>(*this)),
     fvSolution(static_cast<const objectRegistry&>(*this)),
@@ -370,13 +378,20 @@ Foam::fvMesh::fvMesh
 Foam::fvMesh::fvMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<cellList>& cells,
+    pointField&& points,
+    faceList&& faces,
+    cellList&& cells,
     const bool syncPar
 )
 :
-    polyMesh(io, points, faces, cells, syncPar),
+    polyMesh
+    (
+        io,
+        std::move(points),
+        std::move(faces),
+        std::move(cells),
+        syncPar
+    ),
     surfaceInterpolation(*this),
     fvSchemes(static_cast<const objectRegistry&>(*this)),
     fvSolution(static_cast<const objectRegistry&>(*this)),
@@ -400,6 +415,12 @@ Foam::fvMesh::fvMesh
 }
 
 
+Foam::fvMesh::fvMesh(const IOobject& io, const zero, const bool syncPar)
+:
+    fvMesh(io, pointField(), faceList(), labelList(), labelList(), syncPar)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fvMesh::~fvMesh()
@@ -456,7 +477,7 @@ Foam::SolverPerformance<Foam::tensor> Foam::fvMesh::solve
 
 void Foam::fvMesh::addFvPatches
 (
-    const List<polyPatch*> & p,
+    const List<polyPatch*>& p,
     const bool validBoundary
 )
 {
@@ -896,15 +917,15 @@ Foam::fvMesh::validComponents<Foam::sphericalTensor>() const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-bool Foam::fvMesh::operator!=(const fvMesh& bm) const
+bool Foam::fvMesh::operator!=(const fvMesh& rhs) const
 {
-    return &bm != this;
+    return &rhs != this;
 }
 
 
-bool Foam::fvMesh::operator==(const fvMesh& bm) const
+bool Foam::fvMesh::operator==(const fvMesh& rhs) const
 {
-    return &bm == this;
+    return &rhs == this;
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index d68f524309..74b8744812 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -183,15 +183,19 @@ public:
         //- Construct from IOobject
         explicit fvMesh(const IOobject& io);
 
+        //- Construct from IOobject or as zero-sized mesh
+        //  Boundary is added using addPatches() member function
+        fvMesh(const IOobject& io, const zero, bool syncPar=true);
+
         //- Construct from components without boundary.
         //  Boundary is added using addFvPatches() member function
         fvMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<labelList>& allOwner,
-            const Xfer<labelList>& allNeighbour,
+            pointField&& points,
+            faceList&& faces,
+            labelList&& allOwner,
+            labelList&& allNeighbour,
             const bool syncPar = true
         );
 
@@ -200,9 +204,9 @@ public:
         fvMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& points,
-            const Xfer<faceList>& faces,
-            const Xfer<cellList>& cells,
+            pointField&& points,
+            faceList&& faces,
+            cellList&& cells,
             const bool syncPar = true
         );
 
@@ -218,7 +222,7 @@ public:
             //- Add boundary patches. Constructor helper
             void addFvPatches
             (
-                const List<polyPatch*>&,
+                const List<polyPatch*>& p,
                 const bool validBoundary = true
             );
 
@@ -439,8 +443,11 @@ public:
 
     // Member Operators
 
-        bool operator!=(const fvMesh&) const;
-        bool operator==(const fvMesh&) const;
+        //- Compares addresses
+        bool operator!=(const fvMesh& rhs) const;
+
+        //- Compares addresses
+        bool operator==(const fvMesh& rhs) const;
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
index dc4736817a..8bedb2606b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
@@ -57,7 +57,7 @@ Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
         return neighbFvPatch().patchInternalField(iF);
     }
 
-    return tmp<labelField>::New(iF.size(), 0);
+    return tmp<labelField>::New(iF.size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
index e7b694722d..1f1fd16d9f 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
@@ -59,7 +59,7 @@ internalFieldTransfer
         return neighbFvPatch().patchInternalField(iF);
     }
 
-    return tmp<labelField>::New(iF.size(), 0);
+    return tmp<labelField>::New(iF.size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 101b60c59b..df2a1df94d 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -268,18 +268,13 @@ void Foam::singleCellFvMesh::agglomerateMesh
     }
     addFvPatches(newPatches);
 
-    // Owner, neighbour is trivial
-    labelList owner(patchFaces.size(), 0);
-    labelList neighbour(0);
-
-
-    // actually change the mesh
+    // Actually change the mesh. // Owner, neighbour is trivial
     resetPrimitives
     (
-        xferMove(boundaryPoints),
-        xferMove(patchFaces),
-        xferMove(owner),
-        xferMove(neighbour),
+        autoPtr<pointField>::New(std::move(boundaryPoints)),
+        autoPtr<faceList>::New(std::move(patchFaces)),
+        autoPtr<labelList>::New(patchFaces.size(), Zero),  // owner
+        autoPtr<labelList>::New(),                         // neighbour
         patchSizes,
         patchStarts,
         true                //syncPar
@@ -394,15 +389,7 @@ Foam::singleCellFvMesh::singleCellFvMesh
     const fvMesh& mesh
 )
 :
-    fvMesh
-    (
-        io,
-        xferCopy(pointField()), //points
-        xferCopy(faceList()),   //faces
-        xferCopy(labelList()),  //allOwner
-        xferCopy(labelList()),  //allNeighbour
-        false                   //syncPar
-    ),
+    fvMesh(io, Zero, false),
     patchFaceAgglomeration_
     (
         IOobject
@@ -489,15 +476,7 @@ Foam::singleCellFvMesh::singleCellFvMesh
     const labelListList& patchFaceAgglomeration
 )
 :
-    fvMesh
-    (
-        io,
-        xferCopy(pointField()), //points
-        xferCopy(faceList()),   //faces
-        xferCopy(labelList()),  //allOwner
-        xferCopy(labelList()),  //allNeighbour
-        false                   //syncPar
-    ),
+    fvMesh(io, Zero, false),
     patchFaceAgglomeration_
     (
         IOobject
@@ -634,8 +613,4 @@ Foam::singleCellFvMesh::singleCellFvMesh(const IOobject& io)
 {}
 
 
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-
-
 // ************************************************************************* //
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 7d2a8d3ea6..0b74470c08 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -655,8 +655,8 @@ bool Foam::functionObjects::streamLineBase::write()
         const mapDistribute distMap
         (
             globalTrackIDs.size(),
-            sendMap.xfer(),
-            recvMap.xfer()
+            std::move(sendMap),
+            std::move(recvMap)
         );
 
 
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index fbb7aa8683..a187bb47b7 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -821,9 +821,9 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
         }
     }
 
-    extendedProcBbsInRange = tmpExtendedProcBbsInRange.xfer();
-    extendedProcBbsTransformIndex = tmpExtendedProcBbsTransformIndex.xfer();
-    extendedProcBbsOrigProc = tmpExtendedProcBbsOrigProc.xfer();
+    extendedProcBbsInRange.transfer(tmpExtendedProcBbsInRange);
+    extendedProcBbsTransformIndex.transfer(tmpExtendedProcBbsTransformIndex);
+    extendedProcBbsOrigProc.transfer(tmpExtendedProcBbsOrigProc);
 }
 
 
@@ -903,8 +903,8 @@ void Foam::InteractionLists<ParticleType>::buildMap
         new mapDistribute
         (
             constructSize,
-            sendMap.xfer(),
-            constructMap.xfer()
+            std::move(sendMap),
+            std::move(constructMap)
         )
     );
 }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index f270e4a205..0c02517c8e 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -522,7 +522,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
                 IOobject::NO_WRITE,
                 false
             ),
-            xferCopy(vertices_),   // Copy these points, do NOT move
+            pointField(vertices_),   // Copy these points, do NOT move
             tmpBlockCells,
             tmpBlocksPatches,
             patchNames,
@@ -561,7 +561,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
                 IOobject::NO_WRITE,
                 false
             ),
-            xferCopy(vertices_),   // Copy these points, do NOT move
+            pointField(vertices_),   // Copy these points, do NOT move
             tmpBlockCells,
             tmpBlocksPatches,
             patchNames,
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 79100022ff..efeef382f6 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -2897,8 +2897,8 @@ void Foam::snappySnapDriver::doSnap
                 labelList duplicateFace(getInternalOrBaffleDuplicateFace());
 
                 {
-                    labelList oldSplitFaces(splitFaces.xfer());
-                    List<labelPair> oldSplits(splits.xfer());
+                    labelList oldSplitFaces(std::move(splitFaces));
+                    List<labelPair> oldSplits(std::move(splits));
                     forAll(oldSplitFaces, i)
                     {
                         if (duplicateFace[oldSplitFaces[i]] == -1)
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 0d81b99d87..ae79db7a64 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -490,8 +490,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
             new mapDistribute
             (
                 compacti,
-                tgtSubMap.xfer(),
-                tgtConstructMap.xfer()
+                std::move(tgtSubMap),
+                std::move(tgtConstructMap)
             )
         );
     }
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index 051fc0d188..d8da237463 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -454,17 +454,12 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            segmentI,       // size after construction
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        segmentI, // size after construction
+        std::move(sendMap),
+        std::move(constructMap)
     );
-
-    return mapPtr;
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.C b/src/meshTools/coordinateSystems/coordinateSystems.C
index 0e56466f32..08902cdb67 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.C
+++ b/src/meshTools/coordinateSystems/coordinateSystems.C
@@ -89,20 +89,20 @@ Foam::coordinateSystems::coordinateSystems(const IOobject& io)
 Foam::coordinateSystems::coordinateSystems
 (
     const IOobject& io,
-    const PtrList<coordinateSystem>& lst
+    const PtrList<coordinateSystem>& content
 )
 :
-    IOPtrList<coordinateSystem>(io, lst)
+    IOPtrList<coordinateSystem>(io, content)
 {}
 
 
 Foam::coordinateSystems::coordinateSystems
 (
     const IOobject& io,
-    const Xfer<PtrList<coordinateSystem>>& lst
+    PtrList<coordinateSystem>&& content
 )
 :
-    IOPtrList<coordinateSystem>(io, lst)
+    IOPtrList<coordinateSystem>(io, std::move(content))
 {}
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index 2576d1a664..cd15f0f97f 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -91,20 +91,20 @@ public:
     // Constructors
 
         //- Read construct from IOobject
-        explicit coordinateSystems(const IOobject&);
+        explicit coordinateSystems(const IOobject& io);
 
         //- Construct from IOobject and a PtrList
         coordinateSystems
         (
-            const IOobject&,
-            const PtrList<coordinateSystem>&
+            const IOobject& io,
+            const PtrList<coordinateSystem>& content
         );
 
-        //- Construct from IOobject and transferring the PtrList contents
+        //- Construct from IOobject and transferring the PtrList content
         coordinateSystems
         (
-            const IOobject&,
-            const Xfer<PtrList<coordinateSystem>>&
+            const IOobject& io,
+            PtrList<coordinateSystem>&& content
         );
 
 
diff --git a/src/meshTools/edgeMesh/edgeMesh.C b/src/meshTools/edgeMesh/edgeMesh.C
index 801e53bb6f..61e9dcd0f6 100644
--- a/src/meshTools/edgeMesh/edgeMesh.C
+++ b/src/meshTools/edgeMesh/edgeMesh.C
@@ -55,11 +55,7 @@ Foam::wordHashSet Foam::edgeMesh::writeTypes()
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-bool Foam::edgeMesh::canReadType
-(
-    const word& ext,
-    const bool verbose
-)
+bool Foam::edgeMesh::canReadType(const word& ext, bool verbose)
 {
     return checkSupport
     (
@@ -71,11 +67,7 @@ bool Foam::edgeMesh::canReadType
 }
 
 
-bool Foam::edgeMesh::canWriteType
-(
-    const word& ext,
-    const bool verbose
-)
+bool Foam::edgeMesh::canWriteType(const word& ext, bool verbose)
 {
     return checkSupport
     (
@@ -87,11 +79,7 @@ bool Foam::edgeMesh::canWriteType
 }
 
 
-bool Foam::edgeMesh::canRead
-(
-    const fileName& name,
-    const bool verbose
-)
+bool Foam::edgeMesh::canRead(const fileName& name, bool verbose)
 {
     word ext = name.ext();
     if (ext == "gz")
@@ -119,52 +107,6 @@ void Foam::edgeMesh::calcPointEdges() const
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::edgeMesh::edgeMesh()
-:
-    fileFormats::edgeMeshFormatsCore(),
-    points_(0),
-    edges_(0),
-    pointEdgesPtr_(nullptr)
-{}
-
-
-Foam::edgeMesh::edgeMesh
-(
-    const pointField& points,
-    const edgeList& edges
-)
-:
-    fileFormats::edgeMeshFormatsCore(),
-    points_(points),
-    edges_(edges),
-    pointEdgesPtr_(nullptr)
-{}
-
-
-Foam::edgeMesh::edgeMesh
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<edgeList>& edgeLst
-)
-:
-    fileFormats::edgeMeshFormatsCore(),
-    points_(0),
-    edges_(0),
-    pointEdgesPtr_(nullptr)
-{
-    points_.transfer(pointLst());
-    edges_.transfer(edgeLst());
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::edgeMesh::~edgeMesh()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::edgeMesh::clear()
@@ -175,29 +117,6 @@ void Foam::edgeMesh::clear()
 }
 
 
-void Foam::edgeMesh::reset
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<edgeList>& edgeLst
-)
-{
-    // Take over new primitive data.
-    // Optimized to avoid overwriting data at all
-    if (notNull(pointLst))
-    {
-        points_.transfer(pointLst());
-    }
-
-    if (notNull(edgeLst))
-    {
-        edges_.transfer(edgeLst());
-
-        // connectivity likely changed
-        pointEdgesPtr_.clear();
-    }
-}
-
-
 void Foam::edgeMesh::transfer(edgeMesh& mesh)
 {
     points_.transfer(mesh.points_);
@@ -206,12 +125,6 @@ void Foam::edgeMesh::transfer(edgeMesh& mesh)
 }
 
 
-Foam::Xfer<Foam::edgeMesh> Foam::edgeMesh::xfer()
-{
-    return xferMove(*this);
-}
-
-
 Foam::label Foam::edgeMesh::regions(labelList& edgeRegion) const
 {
     edgeRegion.setSize(edges_.size());
diff --git a/src/meshTools/edgeMesh/edgeMesh.H b/src/meshTools/edgeMesh/edgeMesh.H
index 9a5404736b..c06e8bdbd7 100644
--- a/src/meshTools/edgeMesh/edgeMesh.H
+++ b/src/meshTools/edgeMesh/edgeMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,12 +53,12 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
+
+class edgeMesh;
 class Istream;
 class Ostream;
 
-// Forward declaration of friend functions and operators
-class edgeMesh;
 Istream& operator>>(Istream& is, edgeMesh& em);
 Ostream& operator<<(Ostream& os, const edgeMesh& em);
 
@@ -109,13 +109,13 @@ public:
     // Static
 
         //- Can we read this file format?
-        static bool canRead(const fileName& name, const bool verbose=false);
+        static bool canRead(const fileName& name, bool verbose=false);
 
         //- Can we read this file format?
-        static bool canReadType(const word& ext, const bool verbose=false);
+        static bool canReadType(const word& ext, bool verbose=false);
 
         //- Can we write this file format type?
-        static bool canWriteType(const word& ext, const bool verbose=false);
+        static bool canWriteType(const word& ext, bool verbose=false);
 
         static wordHashSet readTypes();
         static wordHashSet writeTypes();
@@ -124,20 +124,19 @@ public:
     // Constructors
 
         //- Construct null
-        edgeMesh();
+        inline edgeMesh();
 
-        //- Construct from components
-        edgeMesh(const pointField& points, const edgeList& edges);
+        //- Copy construct
+        inline edgeMesh(const edgeMesh& em);
 
-        //- Construct by transferring components (points, edges).
-        edgeMesh
-        (
-            const Xfer<pointField>& pointLst,
-            const Xfer<edgeList>& edgeLst
-        );
+        //- Move construct
+        inline edgeMesh(edgeMesh&& em);
 
-        //- Construct as copy
-        edgeMesh(const edgeMesh& em);
+        //- Copy construct from components
+        inline edgeMesh(const pointField& points, const edgeList& edges);
+
+        //- Move construct from components
+        inline edgeMesh(pointField&& pointLst, edgeList&& edgeLst);
 
         //- Construct from file name (uses extension to determine type)
         edgeMesh(const fileName& name);
@@ -174,7 +173,7 @@ public:
 
 
     //- Destructor
-    virtual ~edgeMesh();
+    virtual ~edgeMesh() = default;
 
 
     // Member Function Selectors
@@ -199,10 +198,8 @@ public:
     // Member Functions
 
         //- Transfer the contents of the argument and annul the argument
-        void transfer(edgeMesh&);
+        void transfer(edgeMesh& mesh);
 
-        //- Transfer contents to the Xfer container
-        Xfer<edgeMesh> xfer();
 
     // Read
 
@@ -234,14 +231,6 @@ public:
         //- Clear all storage
         virtual void clear();
 
-        //- Reset primitive data (points, edges)
-        //  Note, optimized to avoid overwriting data (with Xfer::null)
-        virtual void reset
-        (
-            const Xfer<pointField>& points,
-            const Xfer<edgeList>& edges
-        );
-
         //- Scale points. A non-positive factor is ignored
         virtual void scalePoints(const scalar scaleFactor);
 
@@ -266,12 +255,17 @@ public:
 
     // Member Operators
 
+        //- Copy assignment
         inline void operator=(const edgeMesh& rhs);
 
-        // Ostream Operator
+        //- Move assignment
+        inline void operator=(edgeMesh&& rhs);
 
-            friend Ostream& operator<<(Ostream& os, const edgeMesh& em);
-            friend Istream& operator>>(Istream& is, edgeMesh& em);
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream& os, const edgeMesh& em);
+        friend Istream& operator>>(Istream& is, edgeMesh& em);
 
 };
 
diff --git a/src/meshTools/edgeMesh/edgeMeshI.H b/src/meshTools/edgeMesh/edgeMeshI.H
index b5034362de..1df38f0c56 100644
--- a/src/meshTools/edgeMesh/edgeMeshI.H
+++ b/src/meshTools/edgeMesh/edgeMeshI.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,15 @@ inline Foam::edgeList& Foam::edgeMesh::storedEdges()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+inline Foam::edgeMesh::edgeMesh()
+:
+    fileFormats::edgeMeshFormatsCore(),
+    points_(),
+    edges_(),
+    pointEdgesPtr_(nullptr)
+{}
+
+
 inline Foam::edgeMesh::edgeMesh(const edgeMesh& em)
 :
     fileFormats::edgeMeshFormatsCore(),
@@ -48,6 +57,40 @@ inline Foam::edgeMesh::edgeMesh(const edgeMesh& em)
 {}
 
 
+inline Foam::edgeMesh::edgeMesh(edgeMesh&& em)
+:
+    edgeMesh()
+{
+    transfer(em);
+}
+
+
+inline Foam::edgeMesh::edgeMesh
+(
+    const pointField& points,
+    const edgeList& edges
+)
+:
+    fileFormats::edgeMeshFormatsCore(),
+    points_(points),
+    edges_(edges),
+    pointEdgesPtr_(nullptr)
+{}
+
+
+inline Foam::edgeMesh::edgeMesh
+(
+    pointField&& points,
+    edgeList&& edges
+)
+:
+    fileFormats::edgeMeshFormatsCore(),
+    points_(std::move(points)),
+    edges_(std::move(edges)),
+    pointEdgesPtr_(nullptr)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 inline const Foam::pointField& Foam::edgeMesh::points() const
@@ -68,13 +111,13 @@ inline const Foam::labelListList& Foam::edgeMesh::pointEdges() const
     {
         calcPointEdges();
     }
-    return pointEdgesPtr_();
+    return *pointEdgesPtr_;
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::edgeMesh::operator=(const edgeMesh& rhs)
+inline void Foam::edgeMesh::operator=(const edgeMesh& rhs)
 {
     points_ = rhs.points_;
     edges_ = rhs.edges_;
@@ -82,4 +125,10 @@ void Foam::edgeMesh::operator=(const edgeMesh& rhs)
 }
 
 
+inline void Foam::edgeMesh::operator=(edgeMesh&& rhs)
+{
+    transfer(rhs);
+}
+
+
 // ************************************************************************* //
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 114cf26f4c..46994e4a54 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.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-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,13 +91,10 @@ Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ =
 
 Foam::label Foam::extendedEdgeMesh::convexStart_ = 0;
 
-
 Foam::label Foam::extendedEdgeMesh::externalStart_ = 0;
 
-
 Foam::label Foam::extendedEdgeMesh::nPointTypes = 4;
 
-
 Foam::label Foam::extendedEdgeMesh::nEdgeTypes = 5;
 
 
@@ -115,11 +112,7 @@ Foam::wordHashSet Foam::extendedEdgeMesh::writeTypes()
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-bool Foam::extendedEdgeMesh::canReadType
-(
-    const word& ext,
-    const bool verbose
-)
+bool Foam::extendedEdgeMesh::canReadType(const word& ext, bool verbose)
 {
     return edgeMeshFormatsCore::checkSupport
     (
@@ -131,11 +124,7 @@ bool Foam::extendedEdgeMesh::canReadType
 }
 
 
-bool Foam::extendedEdgeMesh::canWriteType
-(
-    const word& ext,
-    const bool verbose
-)
+bool Foam::extendedEdgeMesh::canWriteType(const word& ext, bool verbose)
 {
     return edgeMeshFormatsCore::checkSupport
     (
@@ -147,11 +136,7 @@ bool Foam::extendedEdgeMesh::canWriteType
 }
 
 
-bool Foam::extendedEdgeMesh::canRead
-(
-    const fileName& name,
-    const bool verbose
-)
+bool Foam::extendedEdgeMesh::canRead(const fileName& name, bool verbose)
 {
     word ext = name.ext();
     if (ext == "gz")
@@ -395,7 +380,7 @@ void Foam::extendedEdgeMesh::select
 
 Foam::extendedEdgeMesh::extendedEdgeMesh()
 :
-    edgeMesh(pointField(0), edgeList(0)),
+    edgeMesh(pointField(), edgeList()),
     concaveStart_(0),
     mixedStart_(0),
     nonFeatureStart_(0),
@@ -417,6 +402,30 @@ Foam::extendedEdgeMesh::extendedEdgeMesh()
 {}
 
 
+Foam::extendedEdgeMesh::extendedEdgeMesh(class one::minus)
+:
+    edgeMesh(pointField(), edgeList()),
+    concaveStart_(-1),
+    mixedStart_(-1),
+    nonFeatureStart_(-1),
+    internalStart_(-1),
+    flatStart_(-1),
+    openStart_(-1),
+    multipleStart_(-1),
+    normals_(0),
+    normalVolumeTypes_(0),
+    edgeDirections_(0),
+    normalDirections_(0),
+    edgeNormals_(0),
+    featurePointNormals_(0),
+    featurePointEdges_(0),
+    regionEdges_(0),
+    pointTree_(),
+    edgeTree_(),
+    edgeTreesByType_()
+{}
+
+
 Foam::extendedEdgeMesh::extendedEdgeMesh(const extendedEdgeMesh& fem)
 :
     edgeMesh(fem),
@@ -453,54 +462,24 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const edgeList& edges
 )
 :
-    edgeMesh(points, edges),
-    concaveStart_(0),
-    mixedStart_(0),
-    nonFeatureStart_(0),
-    internalStart_(0),
-    flatStart_(0),
-    openStart_(0),
-    multipleStart_(0),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
-{}
+    extendedEdgeMesh()
+{
+    this->storedPoints() = points;
+    this->storedEdges()  = edges;
+}
 
 
 Foam::extendedEdgeMesh::extendedEdgeMesh
 (
-    const Xfer<pointField>& pointLst,
-    const Xfer<edgeList>& edgeLst
+    pointField&& points,
+    edgeList&& edges
 )
 :
-    edgeMesh(pointLst, edgeLst),
-    concaveStart_(0),
-    mixedStart_(0),
-    nonFeatureStart_(0),
-    internalStart_(0),
-    flatStart_(0),
-    openStart_(0),
-    multipleStart_(0),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
-{}
+    extendedEdgeMesh()
+{
+    this->storedPoints().transfer(points);
+    this->storedEdges().transfer(edges);
+}
 
 
 Foam::extendedEdgeMesh::extendedEdgeMesh
@@ -509,25 +488,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const boolList& surfBaffleRegions
 )
 :
-    edgeMesh(pointField(0), edgeList(0)),
-    concaveStart_(-1),
-    mixedStart_(-1),
-    nonFeatureStart_(-1),
-    internalStart_(-1),
-    flatStart_(-1),
-    openStart_(-1),
-    multipleStart_(-1),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
+    extendedEdgeMesh(one::minus())
 {
     // Extract and reorder the data from surfaceFeatures
     const triSurface& surf = sFeat.surface();
@@ -585,30 +546,12 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
 Foam::extendedEdgeMesh::extendedEdgeMesh
 (
     const PrimitivePatch<face, List, pointField, point>& surf,
-    const labelList& featureEdges,
-    const labelList& regionFeatureEdges,
-    const labelList& featurePoints
+    const labelUList& featureEdges,
+    const labelUList& regionFeatureEdges,
+    const labelUList& featurePoints
 )
 :
-    edgeMesh(pointField(0), edgeList(0)),
-    concaveStart_(-1),
-    mixedStart_(-1),
-    nonFeatureStart_(-1),
-    internalStart_(-1),
-    flatStart_(-1),
-    openStart_(-1),
-    multipleStart_(-1),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
+    extendedEdgeMesh(one::minus())
 {
     sortPointsAndEdges
     (
@@ -669,25 +612,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const word& ext
 )
 :
-    edgeMesh(pointField(0), edgeList(0)),
-    concaveStart_(0),
-    mixedStart_(0),
-    nonFeatureStart_(0),
-    internalStart_(0),
-    flatStart_(0),
-    openStart_(0),
-    multipleStart_(0),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
+    extendedEdgeMesh()
 {
     read(name, ext);
 }
@@ -695,25 +620,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
 
 Foam::extendedEdgeMesh::extendedEdgeMesh(const fileName& name)
 :
-    edgeMesh(pointField(0), edgeList(0)),
-    concaveStart_(0),
-    mixedStart_(0),
-    nonFeatureStart_(0),
-    internalStart_(0),
-    flatStart_(0),
-    openStart_(0),
-    multipleStart_(0),
-    normals_(0),
-    normalVolumeTypes_(0),
-    edgeDirections_(0),
-    normalDirections_(0),
-    edgeNormals_(0),
-    featurePointNormals_(0),
-    featurePointEdges_(0),
-    regionEdges_(0),
-    pointTree_(),
-    edgeTree_(),
-    edgeTreesByType_()
+    extendedEdgeMesh()
 {
     read(name);
 }
@@ -735,10 +642,8 @@ bool Foam::extendedEdgeMesh::read(const fileName& name)
         fileName unzipName = name.lessExt();
         return read(unzipName, unzipName.ext());
     }
-    else
-    {
-        return read(name, ext);
-    }
+
+    return read(name, ext);
 }
 
 
@@ -1098,12 +1003,8 @@ void Foam::extendedEdgeMesh::transfer(extendedEdgeMesh& mesh)
     pointTree_ = std::move(mesh.pointTree_);
     edgeTree_ = std::move(mesh.edgeTree_);
     edgeTreesByType_.transfer(mesh.edgeTreesByType_);
-}
 
-
-Foam::Xfer<Foam::extendedEdgeMesh> Foam::extendedEdgeMesh::xfer()
-{
-    return xferMoveTo<extendedEdgeMesh, extendedEdgeMesh>(*this);
+    mesh.clear();
 }
 
 
@@ -1376,7 +1277,10 @@ void Foam::extendedEdgeMesh::add(const extendedEdgeMesh& fem)
     nonFeatureStart_ = newNonFeatureStart;
 
     // Reset points and edges
-    reset(xferMove(newPoints), newEdges.xfer());
+    {
+        edgeMesh newmesh(std::move(newPoints), std::move(newEdges));
+        edgeMesh::transfer(newmesh);
+    }
 
     // Transfer
     internalStart_ = newInternalStart;
@@ -1489,7 +1393,10 @@ void Foam::extendedEdgeMesh::flipNormals()
     concaveStart_ = newConcaveStart;
 
     // Reset points and edges
-    reset(xferMove(newPoints), newEdges.xfer());
+    {
+        edgeMesh newmesh(std::move(newPoints), std::move(newEdges));
+        edgeMesh::transfer(newmesh);
+    }
 
     // Transfer
     internalStart_ = newInternalStart;
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 649d7d6b13..ac44e1a1b0 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.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) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,11 +67,10 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declarations
+
 class surfaceFeatures;
 class searchableSurface;
-
-// Forward declaration of friend functions and operators
-
 class extendedEdgeMesh;
 
 Istream& operator>>(Istream&, extendedEdgeMesh&);
@@ -86,7 +85,6 @@ class extendedEdgeMesh
 :
     public edgeMesh
 {
-
 public:
 
     //- Runtime type information
@@ -202,6 +200,12 @@ protected:
         mutable PtrList<indexedOctree<treeDataEdge>> edgeTreesByType_;
 
 
+    // Protected Constructors
+
+        //- Construct null, initializing start indices with -1
+        explicit extendedEdgeMesh(class one::minus);
+
+
     // Protected Member Functions
 
         //- Classify the type of feature point. Requires valid stored member
@@ -233,9 +237,9 @@ protected:
         void sortPointsAndEdges
         (
             const Patch&,
-            const labelList& featureEdges,
-            const labelList& regionFeatureEdges,
-            const labelList& feaurePoints
+            const labelUList& featureEdges,
+            const labelUList& regionFeatureEdges,
+            const labelUList& feaurePoints
         );
 
 public:
@@ -249,13 +253,13 @@ public:
         static label nEdgeTypes;
 
         //- Can we read this file format?
-        static bool canRead(const fileName& name, const bool verbose=false);
+        static bool canRead(const fileName& name, bool verbose=false);
 
         //- Can we read this file format?
-        static bool canReadType(const word& ext, const bool verbose=false);
+        static bool canReadType(const word& ext, bool verbose=false);
 
         //- Can we write this file format type?
-        static bool canWriteType(const word& ext, const bool verbose=false);
+        static bool canWriteType(const word& ext, bool verbose=false);
 
         static wordHashSet readTypes();
         static wordHashSet writeTypes();
@@ -278,15 +282,11 @@ public:
         //- Construct from Istream
         extendedEdgeMesh(Istream& is);
 
-        //- Construct from components
+        //- Copy construct from components
         extendedEdgeMesh(const pointField& points, const edgeList& edges);
 
-        //- Construct by transferring components (points, edges)
-        extendedEdgeMesh
-        (
-            const Xfer<pointField>& pointLst,
-            const Xfer<edgeList>& edgeLst
-        );
+        //- Move construct from components
+        extendedEdgeMesh(pointField&& points, edgeList&& edges);
 
         //- Construct given a surface with selected edges,points
         //  (surfaceFeatures)
@@ -301,9 +301,9 @@ public:
         extendedEdgeMesh
         (
             const PrimitivePatch<face, List, pointField, point>& surf,
-            const labelList& featureEdges,
-            const labelList& regionFeatureEdges,
-            const labelList& featurePoints
+            const labelUList& featureEdges,
+            const labelUList& regionFeatureEdges,
+            const labelUList& featurePoints
         );
 
         //- Construct from all components
@@ -513,9 +513,6 @@ public:
             //- Transfer the contents of the argument and annul the argument
             void transfer(extendedEdgeMesh& mesh);
 
-            //- Transfer contents to the Xfer container
-            Xfer<extendedEdgeMesh> xfer();
-
             //- Clear all storage
             virtual void clear();
 
@@ -613,10 +610,10 @@ public:
         );
 
 
-        // Ostream Operator
+    // Ostream Operator
 
-            friend Ostream& operator<<(Ostream&, const extendedEdgeMesh&);
-            friend Istream& operator>>(Istream&, extendedEdgeMesh&);
+        friend Ostream& operator<<(Ostream&, const extendedEdgeMesh&);
+        friend Istream& operator>>(Istream&, extendedEdgeMesh&);
 };
 
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
index 8067971c03..355e4f0cdc 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
@@ -234,10 +234,8 @@ Foam::extendedEdgeMesh::getPointStatus(label ptI) const
     {
         return MIXED;
     }
-    else
-    {
-        return NONFEATURE;
-    }
+
+    return NONFEATURE;
 }
 
 
@@ -260,10 +258,8 @@ Foam::extendedEdgeMesh::getEdgeStatus(label edgeI) const
     {
         return OPEN;
     }
-    else
-    {
-        return MULTIPLE;
-    }
+
+    return MULTIPLE;
 }
 
 
@@ -276,13 +272,11 @@ inline Foam::PackedList<2> Foam::extendedEdgeMesh::edgeBaffles
 
     DynamicList<label> edgeBaffles(eNormals.size());
 
-    forAll(eNormals, enI)
+    for (const label normi : eNormals)
     {
-        const label normI = eNormals[enI];
-
-        if (normalVolumeTypes_[normI])
+        if (normalVolumeTypes_[normi])
         {
-            edgeBaffles.append(normI);
+            edgeBaffles.append(normi);
         }
     }
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index b5d0fc3617..c6c76c7f45 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,9 +36,9 @@ template<class Patch>
 void Foam::extendedEdgeMesh::sortPointsAndEdges
 (
     const Patch& surf,
-    const labelList& featureEdges,
-    const labelList& regionFeatureEdges,// subset of featureEdges: inter-region
-    const labelList& featurePoints
+    const labelUList& featureEdges,
+    const labelUList& regionFeatureEdges,// subset of featureEdges: inter-region
+    const labelUList& featurePoints
 )
 {
     const pointField& sFeatLocalPts(surf.localPoints());
@@ -361,7 +361,10 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
 
     // Reinitialise the edgeMesh with sorted feature points and
     // renumbered edges
-    reset(xferMove(pts), xferMove(eds));
+    {
+        edgeMesh newmesh(std::move(pts), std::move(eds));
+        edgeMesh::transfer(newmesh);
+    }
 
     // Generate the featurePointNormals
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index 3df1a97fb4..d10554a744 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -121,9 +121,9 @@ Foam::extendedFeatureEdgeMesh::extendedFeatureEdgeMesh
 (
     const IOobject& io,
     const PrimitivePatch<face, List, pointField, point>& surf,
-    const labelList& featureEdges,
-    const labelList& regionFeatureEdges,
-    const labelList& featurePoints
+    const labelUList& featureEdges,
+    const labelUList& regionFeatureEdges,
+    const labelUList& featurePoints
 )
 :
     regIOobject(io),
@@ -183,9 +183,6 @@ Foam::extendedFeatureEdgeMesh::~extendedFeatureEdgeMesh()
 {}
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 bool Foam::extendedFeatureEdgeMesh::readData(Istream& is)
@@ -198,7 +195,6 @@ bool Foam::extendedFeatureEdgeMesh::readData(Istream& is)
 bool Foam::extendedFeatureEdgeMesh::writeData(Ostream& os) const
 {
     os << *this;
-
     return os.good();
 }
 
@@ -265,6 +261,6 @@ bool Foam::extendedFeatureEdgeMesh::writeData(Ostream& os) const
 //
 //    return os;
 //}
-//
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
index 7e723a6861..aa42cd76a0 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
@@ -91,9 +91,9 @@ public:
         (
             const IOobject&,
             const PrimitivePatch<face, List, pointField, point>& surf,
-            const labelList& featureEdges,
-            const labelList& regionFeatureEdges,
-            const labelList& featurePoints
+            const labelUList& featureEdges,
+            const labelUList& regionFeatureEdges,
+            const labelUList& featurePoints
         );
 
         //- Construct from all components
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
index 6eead24de3..98ec7a1add 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
@@ -125,16 +125,14 @@ inline Foam::vector Foam::extendedFeatureEdgeMesh::edgeDirection
     {
         return -edgeDirections()[edgeI];
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Requested ptI " << ptI << " is not a point on the requested "
-            << "edgeI " << edgeI << ". edgeI start and end: "
-            << e.start() << " " << e.end()
-            << exit(FatalError);
 
-        return Zero;
-    }
+    FatalErrorInFunction
+        << "Requested ptI " << ptI << " is not a point on the requested "
+        << "edgeI " << edgeI << ". edgeI start and end: "
+        << e.start() << " " << e.end()
+        << exit(FatalError);
+
+    return Zero;
 }
 
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index e6ef2557c8..ad45bfb995 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.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  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -361,7 +361,10 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
 
     // Reinitialise the edgeMesh with sorted feature points and
     // renumbered edges
-    reset(xferMove(pts), xferMove(eds));
+    {
+        edgeMesh newmesh(std::move(pts), std::move(eds));
+        edgeMesh::transfer(newmesh);
+    }
 
     // Generate the featurePointNormals
 
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 7649aef26c..92096f5cae 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -84,12 +84,12 @@ Foam::treeDataEdge::treeDataEdge
     const bool cacheBb,
     const edgeList& edges,
     const pointField& points,
-    const Xfer<labelList>& edgeLabels
+    labelList&& edgeLabels
 )
 :
     edges_(edges),
     points_(points),
-    edgeLabels_(edgeLabels),
+    edgeLabels_(std::move(edgeLabels)),
     cacheBb_(cacheBb)
 {
     update();
diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/meshTools/indexedOctree/treeDataEdge.H
index d26c5f0cf4..a5ed2bd462 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.H
+++ b/src/meshTools/indexedOctree/treeDataEdge.H
@@ -159,7 +159,7 @@ public:
             const bool cacheBb,
             const edgeList& edges,
             const pointField& points,
-            const Xfer<labelList>& edgeLabels
+            labelList&& edgeLabels
         );
 
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 886cf81079..471336fea4 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -86,11 +86,11 @@ Foam::treeDataFace::treeDataFace
 (
     const bool cacheBb,
     const primitiveMesh& mesh,
-    const Xfer<labelList>& faceLabels
+    labelList&& faceLabels
 )
 :
     mesh_(mesh),
-    faceLabels_(faceLabels),
+    faceLabels_(std::move(faceLabels)),
     isTreeFace_(mesh.nFaces(), 0),
     cacheBb_(cacheBb)
 {
diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H
index d6f38a03a5..8eba1732bf 100644
--- a/src/meshTools/indexedOctree/treeDataFace.H
+++ b/src/meshTools/indexedOctree/treeDataFace.H
@@ -64,7 +64,6 @@ class treeDataFace
         static scalar tolSqr;
 
 
-
     // Private data
 
         const primitiveMesh& mesh_;
@@ -150,27 +149,28 @@ public:
 
     // Constructors
 
+        //- Construct from mesh, copying subset of faces
         //- Construct from mesh and subset of faces.
         treeDataFace
         (
             const bool cacheBb,
-            const primitiveMesh&,
-            const labelUList&
+            const primitiveMesh& mesh,
+            const labelUList& faceLabels
         );
 
-        //- Construct from mesh and subset of faces, transferring contents
+        //- Construct from mesh, moving subset of faces
         treeDataFace
         (
             const bool cacheBb,
-            const primitiveMesh&,
-            const Xfer<labelList>&
+            const primitiveMesh& mesh,
+            labelList&& faceLabels
         );
 
         //- Construct from mesh. Uses all faces in mesh.
-        treeDataFace(const bool cacheBb, const primitiveMesh&);
+        treeDataFace(const bool cacheBb, const primitiveMesh& mesh);
 
         //- Construct from mesh. Uses all faces in patch.
-        treeDataFace(const bool cacheBb, const polyPatch&);
+        treeDataFace(const bool cacheBb, const polyPatch& patch);
 
 
     // Member Functions
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index 4801476320..1fe82470f7 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -30,7 +30,7 @@ void Foam::mappedPatchBase::distribute(List<Type>& lst) const
     {
         case NEARESTPATCHFACEAMI:
         {
-            lst = AMI().interpolateToSource(Field<Type>(lst.xfer()));
+            lst = AMI().interpolateToSource(Field<Type>(std::move(lst)));
             break;
         }
         default:
@@ -52,11 +52,7 @@ void Foam::mappedPatchBase::distribute
     {
         case NEARESTPATCHFACEAMI:
         {
-            lst = AMI().interpolateToSource
-                (
-                    Field<Type>(lst.xfer()),
-                    cop
-                );
+            lst = AMI().interpolateToSource(Field<Type>(std::move(lst)), cop);
             break;
         }
         default:
@@ -87,7 +83,7 @@ void Foam::mappedPatchBase::reverseDistribute(List<Type>& lst) const
     {
         case NEARESTPATCHFACEAMI:
         {
-            lst = AMI().interpolateToTarget(Field<Type>(lst.xfer()));
+            lst = AMI().interpolateToTarget(Field<Type>(std::move(lst)));
             break;
         }
         default:
@@ -110,11 +106,7 @@ void Foam::mappedPatchBase::reverseDistribute
     {
         case NEARESTPATCHFACEAMI:
         {
-            lst = AMI().interpolateToTarget
-                (
-                    Field<Type>(lst.xfer()),
-                    cop
-                );
+            lst = AMI().interpolateToTarget(Field<Type>(std::move(lst)), cop);
             break;
         }
         default:
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 7826a10493..838835f30f 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -753,10 +753,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         // (patches guaranteed to be in increasing order)
         mesh.resetPrimitives
         (
-            Xfer<pointField>::null(),
-            xferMove(newFaces),
-            Xfer<labelList>::null(),
-            Xfer<labelList>::null(),
+            autoPtr<pointField>(),  // <- null: leaves points untouched
+            autoPtr<faceList>::New(std::move(newFaces)),
+            autoPtr<labelList>(),   // <- null: leaves owner untouched
+            autoPtr<labelList>(),   // <- null: leaves neighbour untouched
             patchSizes,
             patchStarts,
             true                // boundary forms valid boundary mesh.
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
index 2c7ad4377e..6b2dc1470a 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
@@ -669,7 +669,6 @@ bool Foam::searchableSurfaces::checkIntersection
                             << " locations."
                             << endl;
 
-                        //vtkSetWriter<scalar> setWriter;
                         if (setWriter.valid())
                         {
                             scalarField dist(mag(intersections));
@@ -677,8 +676,8 @@ bool Foam::searchableSurfaces::checkIntersection
                             (
                                 names()[i] + '_' + names()[j],
                                 "xyz",
-                                intersections.xfer(),
-                                dist
+                                std::move(intersections),
+                                std::move(dist)
                             );
                             wordList valueSetNames(1, "edgeIndex");
                             List<const scalarField*> valueSets
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
index 4da25b743b..a5f2a817ac 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
@@ -262,10 +262,13 @@ Foam::autoPtr<Foam::triSurface> Foam::triSurfaceLoader::load
 
     forAll(selected_, surfi)
     {
+        List<labelledTri> addfaces;
+        pointField addpoints;
+
         triSurface addsurf(directory_/selected_[surfi]);
 
-        List<labelledTri> addfaces(addsurf.xferFaces());
-        List<point> addpoints(addsurf.xferPoints());
+        addsurf.swapFaces(addfaces);
+        addsurf.swapPoints(addpoints);
 
         // Offset the points for all additional surfaces
         if (surfi)
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 6c7f8574d2..c06350e255 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -178,8 +178,8 @@ bool Foam::dynamicOversetFvMesh::updateAddressing() const
         new fvMeshPrimitiveLduAddressing
         (
             nCells(),
-            lowerAddr.xfer(),
-            upperAddr.xfer(),
+            std::move(lowerAddr),
+            std::move(upperAddr),
             patchAddr,
             ps
         )
diff --git a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.C b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.C
index d779b59de6..f963e6e5c1 100644
--- a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.C
+++ b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.C
@@ -59,15 +59,15 @@ Foam::fvMeshPrimitiveLduAddressing::fvMeshPrimitiveLduAddressing
 Foam::fvMeshPrimitiveLduAddressing::fvMeshPrimitiveLduAddressing
 (
     const label nCells,
-    const Xfer<labelList>& lowerAddr,
-    const Xfer<labelList>& upperAddr,
+    labelList&& lowerAddr,
+    labelList&& upperAddr,
     const List<const labelUList*>& patchAddr,
     const lduSchedule& ps
 )
 :
     lduAddressing(nCells),
-    lowerAddr_(lowerAddr),
-    upperAddr_(upperAddr),
+    lowerAddr_(std::move(lowerAddr)),
+    upperAddr_(std::move(upperAddr)),
     patchAddr_(patchAddr),
     patchSchedule_(ps)
 {}
diff --git a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
index 097a430812..19662b761f 100644
--- a/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
+++ b/src/overset/fvMeshPrimitiveLduAddressing/fvMeshPrimitiveLduAddressing.H
@@ -92,16 +92,15 @@ public:
         fvMeshPrimitiveLduAddressing
         (
             const label nCells,
-            const Xfer<labelList>& lowerAddr,
-            const Xfer<labelList>& upperAddr,
+            labelList&& lowerAddr,
+            labelList&& upperAddr,
             const List<const labelUList*>& interfaces,
             const lduSchedule& ps
         );
 
 
     //- Destructor
-    virtual ~fvMeshPrimitiveLduAddressing()
-    {}
+    virtual ~fvMeshPrimitiveLduAddressing() = default;
 
 
     // Member Functions
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 247082f5ee..8cd1e1733d 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -339,14 +339,11 @@ Foam::distributedTriSurfaceMesh::distributeSegments
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            segmenti,       // size after construction
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        segmenti, // size after construction
+        std::move(sendMap),
+        std::move(constructMap)
     );
 }
 
@@ -636,9 +633,9 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
     (
         new mapDistribute
         (
-            segmenti,       // size after construction
-            sendMap.xfer(),
-            constructMap.xfer()
+            segmenti, // size after construction
+            std::move(sendMap),
+            std::move(constructMap)
         )
     );
     const mapDistribute& map = mapPtr();
@@ -649,7 +646,6 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
 
     map.distribute(triangleIndex);
 
-
     return mapPtr;
 }
 
@@ -785,16 +781,12 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            segmenti,       // size after construction
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        segmenti, // size after construction
+        std::move(sendMap),
+        std::move(constructMap)
     );
-    return mapPtr;
 }
 
 
@@ -2301,8 +2293,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         new mapDistribute
         (
             allTris.size(),
-            faceSendMap.xfer(),
-            faceConstructMap.xfer()
+            std::move(faceSendMap),
+            std::move(faceConstructMap)
         )
     );
     pointMap.reset
@@ -2310,8 +2302,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         new mapDistribute
         (
             allPoints.size(),
-            pointSendMap.xfer(),
-            pointConstructMap.xfer()
+            std::move(pointSendMap),
+            std::move(pointConstructMap)
         )
     );
 
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index cbb3c2c1e2..a75859f1d7 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -56,19 +56,17 @@ bool Foam::cellVolumeWeightMethod::findInitialSeeds
     const faceList& srcFaces = src_.faces();
     const pointField& srcPts = src_.points();
 
-    for (label i = startSeedI; i < srcCellIDs.size(); i++)
+    for (label i = startSeedI; i < srcCellIDs.size(); ++i)
     {
-        label srcI = srcCellIDs[i];
+        const label srcI = srcCellIDs[i];
 
         if (mapFlag[srcI])
         {
-            const pointField
-                pts(srcCells[srcI].points(srcFaces, srcPts).xfer());
+            const pointField pts(srcCells[srcI].points(srcFaces, srcPts));
 
-            forAll(pts, ptI)
+            for (const point& pt : pts)
             {
-                const point& pt = pts[ptI];
-                label tgtI = tgt_.cellTree().findInside(pt);
+                const label tgtI = tgt_.cellTree().findInside(pt);
 
                 if (tgtI != -1 && intersect(srcI, tgtI))
                 {
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index 0e39240d43..8fce5248eb 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -469,10 +469,10 @@ void Foam::meshToMesh::calculate(const word& methodName, const bool normalise)
                 tgtRegion_.time(),
                 IOobject::NO_READ
             ),
-            xferMove(newTgtPoints),
-            xferMove(newTgtFaces),
-            xferMove(newTgtFaceOwners),
-            xferMove(newTgtFaceNeighbours),
+            std::move(newTgtPoints),
+            std::move(newTgtFaces),
+            std::move(newTgtFaceOwners),
+            std::move(newTgtFaceNeighbours),
             false                                   // no parallel comms
         );
 
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 6fe60c58e9..bae3aa442a 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -246,17 +246,12 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
         }
     }
 
-    autoPtr<mapDistribute> mapPtr
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            segmentI,       // size after construction
-            sendMap.xfer(),
-            constructMap.xfer()
-        )
+        segmentI,       // size after construction
+        std::move(sendMap),
+        std::move(constructMap)
     );
-
-    return mapPtr;
 }
 
 
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
index de4bab4b8c..a8a1899811 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
@@ -466,10 +466,10 @@ const Foam::meshedSurface& Foam::ensightSurfaceReader::geometry()
             }
         }
 
-        surfPtr_.reset(new meshedSurface(xferMove(points), faces.xfer()));
+        surfPtr_.reset(new meshedSurface(std::move(points), std::move(faces)));
     }
 
-    return surfPtr_();
+    return *surfPtr_;
 }
 
 
diff --git a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
index 4fad586ef0..95ca7804a7 100644
--- a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
+++ b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
@@ -53,8 +53,7 @@ Foam::surfMeshSampler::getOrCreateSurfMesh() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            xferCopy(pointField()), // initially no points
-            xferCopy(faceList()),   // initially no faces
+            meshedSurface(),    // Create as empty surface
             name()
         );
         ptr->setWriteOption(IOobject::NO_WRITE);
diff --git a/src/sampling/surface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C
index a08b8fb964..136889368c 100644
--- a/src/sampling/surface/isoSurface/isoSurface.C
+++ b/src/sampling/surface/isoSurface/isoSurface.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.
@@ -1689,19 +1689,21 @@ Foam::isoSurface::isoSurface
     }
 
 
-    // Transfer to mesh storage
+    // Transfer to mesh storage. Note, an iso-surface has no zones
     {
+        // Recover the pointField
+        pointField pts;
+        tmpsurf.swapPoints(pts);
+
+        // Transcribe from triFace to face
         faceList faces;
         tmpsurf.triFaceFaces(faces);
 
-        // An iso-surface has no zones
-        surfZoneList zones(0);
+        tmpsurf.clearOut();
 
-        // Reset primitive data (points, faces and zones)
-        this->MeshStorage::reset
-        (
-            tmpsurf.xferPoints(), faces.xfer(), zones.xfer()
-        );
+        MeshStorage updated(std::move(pts), std::move(faces), surfZoneList());
+
+        this->MeshStorage::transfer(updated);
     }
 }
 
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCell.C b/src/sampling/surface/isoSurface/isoSurfaceCell.C
index 14091a18d0..7e1ca5e4e5 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceCell.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -616,8 +616,6 @@ void Foam::isoSurfaceCell::genPointTris
     const pointField& pts = mesh_.points();
     const cell& cFaces = mesh_.cells()[celli];
 
-    FixedList<label, 4> tet;
-
     // Make tet from this face to the 4th point (same as cellcentre in
     // non-tet cells)
     const face& f = mesh_.faces()[facei];
@@ -1563,19 +1561,21 @@ Foam::isoSurfaceCell::isoSurfaceCell
     }
 
 
-    // Transfer to mesh storage
+    // Transfer to mesh storage. Note, an iso-surface has no zones
     {
+        // Recover the pointField
+        pointField pts;
+        tmpsurf.swapPoints(pts);
+
+        // Transcribe from triFace to face
         faceList faces;
         tmpsurf.triFaceFaces(faces);
 
-        // An iso-surface has no zones
-        surfZoneList zones(0);
+        tmpsurf.clearOut();
 
-        // Reset primitive data (points, faces and zones)
-        this->MeshStorage::reset
-        (
-            tmpsurf.xferPoints(), faces.xfer(), zones.xfer()
-        );
+        MeshStorage updated(std::move(pts), std::move(faces), surfZoneList());
+
+        this->MeshStorage::transfer(updated);
     }
 }
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 5ff888af9a..2be602bf46 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -57,7 +57,7 @@ template<class Face>
 bool Foam::MeshedSurface<Face>::canReadType
 (
     const word& ext,
-    const bool verbose
+    bool verbose
 )
 {
     return fileFormats::surfaceFormatsCore::checkSupport
@@ -74,7 +74,7 @@ template<class Face>
 bool Foam::MeshedSurface<Face>::canWriteType
 (
     const word& ext,
-    const bool verbose
+    bool verbose
 )
 {
     return fileFormats::surfaceFormatsCore::checkSupport
@@ -91,7 +91,7 @@ template<class Face>
 bool Foam::MeshedSurface<Face>::canRead
 (
     const fileName& name,
-    const bool verbose
+    bool verbose
 )
 {
     word ext = name.ext();
@@ -166,47 +166,6 @@ Foam::MeshedSurface<Face>::MeshedSurface()
 {}
 
 
-template<class Face>
-Foam::MeshedSurface<Face>::MeshedSurface
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<surfZoneList>& zoneLst
-)
-:
-    MeshedSurface<Face>()
-{
-    reset(pointLst, faceLst, zoneLst);
-}
-
-
-template<class Face>
-Foam::MeshedSurface<Face>::MeshedSurface
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const labelUList& zoneSizes,
-    const UList<word>& zoneNames
-)
-:
-    MeshedSurface<Face>()
-{
-    reset(pointLst, faceLst, Xfer<surfZoneList>());
-
-    if (zoneSizes.size())
-    {
-        if (zoneNames.size())
-        {
-            addZones(zoneSizes, zoneNames);
-        }
-        else
-        {
-            addZones(zoneSizes);
-        }
-    }
-}
-
-
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
@@ -241,17 +200,119 @@ Foam::MeshedSurface<Face>::MeshedSurface
 }
 
 
+template<class Face>
+Foam::MeshedSurface<Face>::MeshedSurface
+(
+    MeshedSurface<Face>&& surf
+)
+:
+    MeshedSurface<Face>()
+{
+    transfer(surf);
+}
+
+
+template<class Face>
+Foam::MeshedSurface<Face>::MeshedSurface
+(
+    UnsortedMeshedSurface<Face>&& surf
+)
+:
+    MeshedSurface<Face>()
+{
+    transfer(surf);
+}
+
+
+template<class Face>
+    Foam::MeshedSurface<Face>::MeshedSurface
+(
+    const pointField& pointLst,
+    const UList<Face>& faceLst,
+    const UList<surfZone>& zoneLst
+)
+:
+    ParentType(faceLst, pointLst), // Copy construct
+    zones_(zoneLst)
+{}
+
+
+template<class Face>
+Foam::MeshedSurface<Face>::MeshedSurface
+(
+    pointField&& pointLst,
+    List<Face>&& faceLst,
+    const UList<surfZone>& zoneLst
+)
+:
+    ParentType(faceLst, pointLst, true), // Move construct
+    zones_(zoneLst)
+{}
+
+
+template<class Face>
+Foam::MeshedSurface<Face>::MeshedSurface
+(
+    const pointField& pointLst,
+    const UList<Face>& faceLst,
+    const labelUList& zoneSizes,
+    const UList<word>& zoneNames
+)
+:
+    ParentType(faceLst, pointLst), // Copy construct
+    zones_()
+{
+    if (zoneSizes.size())
+    {
+        if (zoneNames.size())
+        {
+            addZones(zoneSizes, zoneNames);
+        }
+        else
+        {
+            addZones(zoneSizes);
+        }
+    }
+}
+
+
+template<class Face>
+Foam::MeshedSurface<Face>::MeshedSurface
+(
+    pointField&& pointLst,
+    List<Face>&& faceLst,
+    const labelUList& zoneSizes,
+    const UList<word>& zoneNames
+)
+:
+    ParentType(faceLst, pointLst, true), // Move construct
+    zones_()
+{
+    if (zoneSizes.size())
+    {
+        if (zoneNames.size())
+        {
+            addZones(zoneSizes, zoneNames);
+        }
+        else
+        {
+            addZones(zoneSizes);
+        }
+    }
+}
+
+
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface(const surfMesh& mesh)
 :
     MeshedSurface<Face>()
 {
-    // same face type as surfMesh
+    // Need same face type as surfMesh
     MeshedSurface<face> surf
     (
-        xferCopy(mesh.points()),
-        xferCopy(mesh.faces()),
-        xferCopy(mesh.surfZones())
+        mesh.points(),
+        mesh.faces(),
+        mesh.surfZones()
     );
 
     this->transcribe(surf);
@@ -300,10 +361,8 @@ Foam::MeshedSurface<Face>::MeshedSurface
 
     label startFacei = 0;
     label nZone = 0;
-    forAll(bPatches, patchi)
+    for (const polyPatch& p : bPatches)
     {
-        const polyPatch& p = bPatches[patchi];
-
         if (p.size())
         {
             newZones[nZone] = surfZone
@@ -321,13 +380,8 @@ Foam::MeshedSurface<Face>::MeshedSurface
 
     newZones.setSize(nZone);
 
-    // same face type as the polyBoundaryMesh
-    MeshedSurface<face> surf
-    (
-        xferCopy(bPoints),
-        xferCopy(bFaces),
-        xferMove(newZones)
-    );
+    // Face type as per polyBoundaryMesh
+    MeshedSurface<face> surf(bPoints, bFaces, newZones);
 
     this->transcribe(surf);
 }
@@ -363,7 +417,7 @@ Foam::MeshedSurface<Face>::MeshedSurface(Istream& is)
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
-    const Time& t,
+    const Time& runTime,
     const word& surfName
 )
 :
@@ -374,8 +428,8 @@ Foam::MeshedSurface<Face>::MeshedSurface
         IOobject
         (
             "dummyName",
-            t.timeName(),
-            t,
+            runTime.timeName(),
+            runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
             false
@@ -383,42 +437,16 @@ Foam::MeshedSurface<Face>::MeshedSurface
         surfName
     );
 
-    // same face type as surfMesh
+    // The geometry components, returned via autoPtr
     MeshedSurface<face> surf
     (
-        xferMove(mesh.storedPoints()),
-        xferMove(mesh.storedFaces()),
-        xferMove(mesh.storedZones())
+        std::move(*(mesh.releaseGeom()))
     );
 
     this->transcribe(surf);
 }
 
 
-template<class Face>
-Foam::MeshedSurface<Face>::MeshedSurface
-(
-    const Xfer<MeshedSurface<Face>>& surf
-)
-:
-    MeshedSurface<Face>()
-{
-    transfer(surf());
-}
-
-
-template<class Face>
-Foam::MeshedSurface<Face>::MeshedSurface
-(
-    const Xfer<UnsortedMeshedSurface<Face>>& surf
-)
-:
-    MeshedSurface<Face>()
-{
-    transfer(surf());
-}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -482,7 +510,7 @@ void Foam::MeshedSurface<Face>::remapFaces
 template<class Face>
 void Foam::MeshedSurface<Face>::clear()
 {
-    ParentType::clearOut();
+    ParentType::clearOut();  // Topology changes
 
     storedPoints().clear();
     storedFaces().clear();
@@ -493,8 +521,7 @@ void Foam::MeshedSurface<Face>::clear()
 template<class Face>
 void Foam::MeshedSurface<Face>::movePoints(const pointField& newPoints)
 {
-    // Changes areas, normals etc.
-    ParentType::clearGeom();
+    ParentType::clearGeom();  // Changes areas, normals etc.
 
     // Adapt for new point position
     ParentType::movePoints(newPoints);
@@ -510,8 +537,7 @@ void Foam::MeshedSurface<Face>::scalePoints(const scalar scaleFactor)
     // Avoid bad scaling
     if (scaleFactor > 0 && scaleFactor != 1.0)
     {
-        // Changes areas, normals etc.
-        ParentType::clearGeom();
+        ParentType::clearGeom();  // Changes areas, normals etc.
 
         pointField newPoints(scaleFactor*this->points());
 
@@ -523,74 +549,6 @@ void Foam::MeshedSurface<Face>::scalePoints(const scalar scaleFactor)
 }
 
 
-template<class Face>
-void Foam::MeshedSurface<Face>::reset
-(
-    const Xfer<MeshedSurface<Face>>& surf
-)
-{
-    transfer(surf());
-}
-
-
-template<class Face>
-void Foam::MeshedSurface<Face>::reset
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<surfZoneList>& zoneLst
-)
-{
-    ParentType::clearOut();
-
-    // Take over new primitive data.
-    // Optimized to avoid overwriting data at all
-    if (notNull(pointLst))
-    {
-        storedPoints().transfer(pointLst());
-    }
-
-    if (notNull(faceLst))
-    {
-        storedFaces().transfer(faceLst());
-    }
-
-    if (notNull(zoneLst))
-    {
-        storedZones().transfer(zoneLst());
-    }
-}
-
-
-template<class Face>
-void Foam::MeshedSurface<Face>::reset
-(
-    const Xfer<List<point>>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<surfZoneList>& zoneLst
-)
-{
-    ParentType::clearOut();
-
-    // Take over new primitive data.
-    // Optimized to avoid overwriting data at all
-    if (notNull(pointLst))
-    {
-        storedPoints().transfer(pointLst());
-    }
-
-    if (notNull(faceLst))
-    {
-        storedFaces().transfer(faceLst());
-    }
-
-    if (notNull(zoneLst))
-    {
-        storedZones().transfer(zoneLst());
-    }
-}
-
-
 // Remove badly degenerate faces, double faces.
 template<class Face>
 void Foam::MeshedSurface<Face>::cleanup(const bool verbose)
@@ -678,8 +636,9 @@ bool Foam::MeshedSurface<Face>::stitchFaces
     }
     faceMap.clear();
 
-    // Merging points might have changed geometric factors
+    // Topology can change when points are merged, etc
     ParentType::clearOut();
+
     return true;
 }
 
@@ -1110,11 +1069,11 @@ Foam::MeshedSurface<Face> Foam::MeshedSurface<Face>::subsetMesh
 
 
     // construct a sub-surface
-    return MeshedSurface
+    return MeshedSurface<Face>
     (
-        xferMove(newPoints),
-        xferMove(newFaces),
-        xferMove(newZones)
+        std::move(newPoints),
+        std::move(newFaces),
+        std::move(newZones)
     );
 }
 
@@ -1131,13 +1090,28 @@ Foam::MeshedSurface<Face> Foam::MeshedSurface<Face>::subsetMesh
 
 
 
+template<class Face>
+void Foam::MeshedSurface<Face>::swap
+(
+    MeshedSurface<Face>& surf
+)
+{
+    ParentType::clearOut(); // Topology changes
+    surf.clearOut();        // Topology changes
+
+    this->storedPoints().swap(surf.storedPoints());
+    this->storedFaces().swap(surf.storedFaces());
+    this->storedZones().swap(surf.storedZones());
+}
+
+
 template<class Face>
 void Foam::MeshedSurface<Face>::transfer
 (
     MeshedSurface<Face>& surf
 )
 {
-    ParentType::clearOut();
+    ParentType::clearOut();  // Topology changes
 
     this->storedPoints().transfer(surf.storedPoints());
     this->storedFaces().transfer(surf.storedFaces());
@@ -1158,73 +1132,64 @@ void Foam::MeshedSurface<Face>::transfer
     labelList faceMap;
     surfZoneList zoneLst = surf.sortedZones(faceMap);
 
-    if (zoneLst.size() <= 1)
+    List<Face>& faceLst = surf.storedFaces();
+
+    if (zoneLst.size() > 1)
     {
-        reset
-        (
-            xferMove(surf.storedPoints()),
-            xferMove(surf.storedFaces()),
-            Xfer<surfZoneList>()
-        );
-    }
-    else
-    {
-        List<Face>& oldFaces = surf.storedFaces();
-        List<Face> newFaces(faceMap.size());
+        // Unknown if we really need to sort the faces
+        List<Face> sortedFaces(faceMap.size());
 
         forAll(faceMap, facei)
         {
-            newFaces[faceMap[facei]].transfer(oldFaces[facei]);
+            sortedFaces[faceMap[facei]].transfer(faceLst[facei]);
         }
 
-        reset
-        (
-            xferMove(surf.storedPoints()),
-            xferMove(newFaces),
-            xferMove(zoneLst)
-        );
+        faceLst.swap(sortedFaces);  // Replace with sorted faces
     }
 
-    faceMap.clear();
+    MeshedSurface<Face> newSurf
+    (
+        std::move(surf.storedPoints()),
+        std::move(faceLst),
+        std::move(zoneLst)
+    );
+
     surf.clear();
+
+    this->swap(newSurf);
 }
 
 
 template<class Face>
-Foam::Xfer<Foam::MeshedSurface<Face>>
-Foam::MeshedSurface<Face>::xfer()
+Foam::autoPtr<Foam::MeshedSurface<Face>>
+Foam::MeshedSurface<Face>::releaseGeom()
 {
-    return xferMove(*this);
+    return autoPtr<MeshedSurface<Face>>::New(std::move(*this));
 }
 
 
 template<class Face>
-Foam::Xfer<Foam::List<Face>>
-Foam::MeshedSurface<Face>::xferFaces()
+void Foam::MeshedSurface<Face>::swapFaces(List<Face>& faces)
 {
-    // Topology changed because of transfer
-    ParentType::clearOut();
+    ParentType::clearOut();  // Topology changes
 
-    return this->storedFaces().xfer();
+    this->storedFaces().swap(faces);
 }
 
 
 template<class Face>
-Foam::Xfer<Foam::List<Foam::point>>
-Foam::MeshedSurface<Face>::xferPoints()
+void Foam::MeshedSurface<Face>::swapPoints(pointField& points)
 {
-    // Topology changed because of transfer
-    ParentType::clearOut();
+    ParentType::clearOut();  // Topology changes
 
-    return this->storedPoints().xfer();
+    this->storedPoints().swap(points);
 }
 
 
 template<class Face>
-Foam::Xfer<Foam::surfZoneList>
-Foam::MeshedSurface<Face>::xferZones()
+void Foam::MeshedSurface<Face>::swapZones(surfZoneList& zones)
 {
-    return this->storedZones().xfer();
+    this->storedZones().swap(zones);
 }
 
 
@@ -1272,7 +1237,7 @@ void Foam::MeshedSurface<Face>::write
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Face>
-void Foam::MeshedSurface<Face>::operator=(const MeshedSurface& surf)
+void Foam::MeshedSurface<Face>::operator=(const MeshedSurface<Face>& surf)
 {
     clear();
 
@@ -1282,6 +1247,13 @@ void Foam::MeshedSurface<Face>::operator=(const MeshedSurface& surf)
 }
 
 
+template<class Face>
+void Foam::MeshedSurface<Face>::operator=(MeshedSurface<Face>&& surf)
+{
+    transfer(surf);
+}
+
+
 template<class Face>
 Foam::MeshedSurface<Face>::operator Foam::MeshedSurfaceProxy<Face>() const
 {
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 118bce8290..bcabd90388 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -90,9 +90,11 @@ class MeshedSurface
     public PrimitivePatch<Face, ::Foam::List, pointField, point>,
     public fileFormats::surfaceFormatsCore
 {
-    // friends - despite different face representations
+    // Friends, regardless of face representations
     template<class Face2> friend class MeshedSurface;
     template<class Face2> friend class UnsortedMeshedSurface;
+
+    // Friendship with surfMesh is needed for transferring
     friend class surfMesh;
 
 
@@ -117,7 +119,7 @@ private:
 
         //- Zone information
         // (face ordering nFaces/startFace only used during reading/writing)
-        List<surfZone> zones_;
+        surfZoneList zones_;
 
 
     // Private Member functions
@@ -163,8 +165,8 @@ protected:
         //- Sort faces by zones and store sorted faces
         void sortFacesAndStore
         (
-            const Xfer<List<Face>>& unsortedFaces,
-            const Xfer<List<label>>& zoneIds,
+            DynamicList<Face>& unsortedFaces,
+            DynamicList<label>& zoneIds,
             const bool sorted
         );
 
@@ -186,13 +188,13 @@ public:
     // Static
 
         //- Can we read this file format?
-        static bool canRead(const fileName&, const bool verbose=false);
+        static bool canRead(const fileName& name, bool verbose=false);
 
         //- Can we read this file format?
-        static bool canReadType(const word& ext, const bool verbose=false);
+        static bool canReadType(const word& ext, bool verbose=false);
 
         //- Can we write this file format?
-        static bool canWriteType(const word& ext, const bool verbose=false);
+        static bool canWriteType(const word& ext, bool verbose=false);
 
         //- Known readable file-types
         static wordHashSet readTypes();
@@ -203,49 +205,68 @@ public:
 
     // Constructors
 
-        //- Construct null
+        //- Construct null, an empty surface
         MeshedSurface();
 
-        //- Construct by transferring components (points, faces, zones).
-        MeshedSurface
-        (
-            const Xfer<pointField>& pointLst,
-            const Xfer<List<Face>>& faceLst,
-            const Xfer<surfZoneList>& zoneLst
-        );
-
-        //- Construct by transferring components (points, faces).
-        //  Use zone information if available
-        MeshedSurface
-        (
-            const Xfer<pointField>& pointLst,
-            const Xfer<List<Face>>& faceLst,
-            const labelUList& zoneSizes = labelUList(),
-            const UList<word>& zoneNames = UList<word>()
-        );
-
         //- Copy construct
         MeshedSurface(const MeshedSurface& surf);
 
         //- Copy construct from an UnsortedMeshedSurface
         MeshedSurface(const UnsortedMeshedSurface<Face>& surf);
 
+        //- Move construct
+        MeshedSurface(MeshedSurface&& surf);
+
+        //- Move construct from an UnsortedMeshedSurface
+        MeshedSurface(UnsortedMeshedSurface<Face>&& surf);
+
+        //- Copy construct from components (points, faces, zones).
+        MeshedSurface
+        (
+            const pointField& pointLst,
+            const UList<Face>& faceLst,
+            const UList<surfZone>& zoneLst
+        );
+
+        //- Move construct from components (points, faces).
+        //  Zone information is fairly lightweight and is copied.
+        MeshedSurface
+        (
+            pointField&& pointLst,
+            List<Face>&& faceLst,
+            const UList<surfZone>& zoneLst
+        );
+
+        //- Copy construct from components (points, faces).
+        //  Use zone information if available
+        MeshedSurface
+        (
+            const pointField& pointLst,
+            const UList<Face>& faceLst,
+            const labelUList& zoneSizes = labelUList(),
+            const UList<word>& zoneNames = UList<word>()
+        );
+
+        //- Move construct from components (points, faces).
+        //  Use zone information if available
+        MeshedSurface
+        (
+            pointField&& pointLst,
+            List<Face>&& faceLst,
+            const labelUList& zoneSizes = labelUList(),
+            const UList<word>& zoneNames = UList<word>()
+        );
+
         //- Construct from a boundary mesh with local points/faces
         MeshedSurface
         (
             const polyBoundaryMesh& bMesh,
-            const bool globalPoints=false
+            const bool globalPoints = false
         );
 
         //- Construct from a surfMesh
         MeshedSurface(const surfMesh& mesh);
 
-        //- Construct by transferring the contents from a MeshedSurface
-        MeshedSurface(const Xfer<MeshedSurface<Face>>& surf);
-
-        //- Construct by transferring the contents from a UnsortedMeshedSurface
-        MeshedSurface(const Xfer<UnsortedMeshedSurface<Face>>& surf);
-
         //- Construct from file name (uses extension to determine type)
         MeshedSurface(const fileName& name);
 
@@ -256,11 +277,7 @@ public:
         MeshedSurface(Istream& is);
 
         //- Construct from database
-        MeshedSurface
-        (
-            const Time& t,
-            const word& surfName = word::null
-        );
+        MeshedSurface(const Time& runTime, const word& surfName = word::null);
 
 
     // Declare run-time constructor selection table
@@ -330,212 +347,196 @@ public:
 
     // Member Functions
 
-        // Access
+    // Access
 
-            //- The surface size is the number of faces
-            label size() const
-            {
-                return ParentType::size();
-            }
+        //- The surface size is the number of faces
+        label size() const
+        {
+            return ParentType::size();
+        }
 
-            //- Return const access to the faces
-            inline const List<Face>& surfFaces() const
-            {
-                return static_cast<const List<Face>&>(*this);
-            }
+        //- Return const access to the faces
+        inline const List<Face>& surfFaces() const
+        {
+            return static_cast<const List<Face>&>(*this);
+        }
 
-            //- Const access to the surface zones.
-            //  If zones are defined, they must be contiguous and cover the
-            //  entire surface
-            const List<surfZone>& surfZones() const
-            {
-                return zones_;
-            }
+        //- Const access to the surface zones.
+        //  If zones are defined, they must be contiguous and cover the
+        //  entire surface
+        const surfZoneList& surfZones() const
+        {
+            return zones_;
+        }
 
-            //- Face area vectors (normals)
-            inline const vectorField& Sf() const
-            {
-                return ParentType::faceAreas();
-            }
+        //- Face area vectors (normals)
+        inline const vectorField& Sf() const
+        {
+            return ParentType::faceAreas();
+        }
 
-            //- Face area magnitudes
-            inline const scalarField& magSf() const
-            {
-                return ParentType::magFaceAreas();
-            }
+        //- Face area magnitudes
+        inline const scalarField& magSf() const
+        {
+            return ParentType::magFaceAreas();
+        }
 
-            //- Face centres
-            inline const vectorField& Cf() const
-            {
-                return ParentType::faceCentres();
-            }
+        //- Face centres
+        inline const vectorField& Cf() const
+        {
+            return ParentType::faceCentres();
+        }
 
 
-        // Edit
+    // Edit
 
-            //- Clear all storage
-            virtual void clear();
+        //- Clear all storage
+        virtual void clear();
 
 
-            //- Add surface zones
-            virtual void addZones
-            (
-                const UList<surfZone>&,
-                const bool cullEmpty=false
-            );
+        //- Add surface zones
+        virtual void addZones
+        (
+            const UList<surfZone>&,
+            const bool cullEmpty=false
+        );
 
-            //- Add surface zones
-            virtual void addZones
-            (
-                const labelUList& sizes,
-                const UList<word>& names,
-                const bool cullEmpty=false
-            );
+        //- Add surface zones
+        virtual void addZones
+        (
+            const labelUList& sizes,
+            const UList<word>& names,
+            const bool cullEmpty=false
+        );
 
-            //- Add surface zones
-            virtual void addZones
-            (
-                const labelUList& sizes,
-                const bool cullEmpty=false
-            );
+        //- Add surface zones
+        virtual void addZones
+        (
+            const labelUList& sizes,
+            const bool cullEmpty=false
+        );
 
-            //- Propagate zone information on face regions.
-            //  Normally a no-op, only used by the labelledTri specialization.
-            //  Specializations return true, others return false.
-            bool addZonesToFaces();
+        //- Propagate zone information on face regions.
+        //  Normally a no-op, only used by the labelledTri specialization.
+        //  Specializations return true, others return false.
+        bool addZonesToFaces();
 
 
-            //- Remove surface zones
-            virtual void removeZones();
+        //- Remove surface zones
+        virtual void removeZones();
 
 
-            //- Move points
-            virtual void movePoints(const pointField& newPoints);
+        //- Move points
+        virtual void movePoints(const pointField& newPoints);
 
-            //- Scale points. A non-positive factor is ignored
-            virtual void scalePoints(const scalar scaleFactor);
+        //- Scale points. A non-positive factor is ignored
+        virtual void scalePoints(const scalar scaleFactor);
 
-            //- Reset by transferring contents of the argument and annul it
-            virtual void reset
-            (
-                const Xfer<MeshedSurface<Face>>& surf
-            );
+        //- Remove invalid faces
+        virtual void cleanup(const bool verbose);
 
-            //- Reset primitive data (points, faces and zones)
-            //  Note, optimized to avoid overwriting data (with Xfer::null)
-            virtual void reset
-            (
-                const Xfer<pointField>& points,
-                const Xfer<List<Face>>& faces,
-                const Xfer<surfZoneList>& zones
-            );
+        virtual bool stitchFaces
+        (
+            const scalar tol=SMALL,
+            const bool verbose=false
+        );
 
-            //- Reset primitive data (points, faces and zones)
-            //  Note, optimized to avoid overwriting data (with Xfer::null)
-            virtual void reset
-            (
-                const Xfer<List<point>>& points,
-                const Xfer<List<Face>>& faces,
-                const Xfer<surfZoneList>& zones
-            );
+        virtual bool checkFaces
+        (
+            const bool verbose=false
+        );
 
-            //- Remove invalid faces
-            virtual void cleanup(const bool verbose);
+        //- Count number of triangles.
+        virtual label nTriangles() const;
 
-            virtual bool stitchFaces
-            (
-                const scalar tol=SMALL,
-                const bool verbose=false
-            );
+        //- Count number of triangles, returning a face map of original ids.
+        //  The faceMap is zero-sized when no triangulation would be needed.
+        virtual label nTriangles(List<label>& faceMap) const;
 
-            virtual bool checkFaces
-            (
-                const bool verbose=false
-            );
+        //- Triangulate in-place, returning the number of triangles added.
+        virtual label triangulate();
 
-            //- Count number of triangles.
-            virtual label nTriangles() const;
+        //- Triangulate in-place, returning the number of triangles added
+        //  and setting a map of original face Ids.
+        //  The faceMap is zero-sized when no triangulation was done.
+        virtual label triangulate(List<label>& faceMap);
 
-            //- Count number of triangles, returning a face map of original ids.
-            //  The faceMap is zero-sized when no triangulation would be needed.
-            virtual label nTriangles(List<label>& faceMap) const;
+        //- Return new surface.
+        //  Returns return pointMap, faceMap from subsetMeshMap
+        MeshedSurface subsetMesh
+        (
+            const labelHashSet& include,
+            labelList& pointMap,
+            labelList& faceMap
+        ) const;
 
-            //- Triangulate in-place, returning the number of triangles added.
-            virtual label triangulate();
-
-            //- Triangulate in-place, returning the number of triangles added
-            //  and setting a map of original face Ids.
-            //  The faceMap is zero-sized when no triangulation was done.
-            virtual label triangulate(List<label>& faceMap);
-
-            //- Return new surface.
-            //  Returns return pointMap, faceMap from subsetMeshMap
-            MeshedSurface subsetMesh
-            (
-                const labelHashSet& include,
-                labelList& pointMap,
-                labelList& faceMap
-            ) const;
-
-            //- Return new surface.
-            MeshedSurface subsetMesh
-            (
-                const labelHashSet& include
-            ) const;
-
-            //- Transfer the contents of the argument and annul the argument
-            void transfer(MeshedSurface<Face>&);
-
-            //- Transfer the contents of the argument and annul the argument
-            void transfer(UnsortedMeshedSurface<Face>&);
-
-            //- Transfer contents to the Xfer container
-            Xfer<MeshedSurface<Face>> xfer();
-
-            //- Transfer stored faces to an Xfer container
-            Xfer<List<Face>> xferFaces();
-
-            //- Transfer stored points to an Xfer container
-            Xfer<List<point>> xferPoints();
-
-            //- Transfer stored zones to an Xfer container
-            Xfer<surfZoneList> xferZones();
+        //- Return new surface.
+        MeshedSurface subsetMesh
+        (
+            const labelHashSet& include
+        ) const;
 
 
-        // Read
+        //- Swap contents
+        void swap(MeshedSurface<Face>& surf);
 
-            //- Read from file. Chooses reader based on explicit extension
-            bool read(const fileName& name, const word& ext);
+        //- Transfer the contents of the argument and annul the argument
+        void transfer(MeshedSurface<Face>& surf);
 
-            //- Read from file. Chooses reader based on detected extension
-            virtual bool read(const fileName& name);
+        //- Transfer the contents of the argument and annul the argument
+        void transfer(UnsortedMeshedSurface<Face>& surf);
+
+        //- Release (clear) geometry and return for reuse
+        autoPtr<MeshedSurface<Face>> releaseGeom();
+
+        //- Swap the stored faces
+        void swapFaces(List<Face>& faces);
+
+        //- Swap the stored points
+        void swapPoints(pointField& points);
+
+        //- Swap the stored zones
+        void swapZones(surfZoneList& zones);
 
 
-        // Write
+    // Read
 
-            void writeStats(Ostream& os) const;
+        //- Read from file. Chooses reader based on explicit extension
+        bool read(const fileName& name, const word& ext);
 
-            //- Generic write routine. Chooses writer based on extension.
-            virtual void write
-            (
-                const fileName& name,
-                const dictionary& options = dictionary::null
-            ) const
-            {
-                write(name, *this, options);
-            }
+        //- Read from file. Chooses reader based on detected extension
+        virtual bool read(const fileName& name);
 
-            //- Write to database
-            void write
-            (
-                const Time& t,
-                const word& surfName = word::null
-            ) const;
+
+    // Write
+
+        void writeStats(Ostream& os) const;
+
+        //- Generic write routine. Chooses writer based on extension.
+        virtual void write
+        (
+            const fileName& name,
+            const dictionary& options = dictionary::null
+        ) const
+        {
+            write(name, *this, options);
+        }
+
+        //- Write to database
+        void write
+        (
+            const Time& t,
+            const word& surfName = word::null
+        ) const;
 
 
     // Member operators
 
-        void operator=(const MeshedSurface<Face>&);
+        //- Copy assignment
+        void operator=(const MeshedSurface<Face>& surf);
+
+        //- Move assignment
+        void operator=(MeshedSurface<Face>&& surf);
 
         //- Conversion operator to MeshedSurfaceProxy
         operator MeshedSurfaceProxy<Face>() const;
@@ -547,8 +548,8 @@ public:
         //  Avoid using to read/write file content (fragile).
         friend Istream& operator>> <Face>
         (
-            Istream&,
-            MeshedSurface<Face>&
+            Istream& is,
+            MeshedSurface<Face>& surf
         );
 
 
@@ -556,8 +557,8 @@ public:
         //  Avoid using to read/write file content (fragile).
         friend Ostream& operator<< <Face>
         (
-            Ostream&,
-            const MeshedSurface<Face>&
+            Ostream& os,
+            const MeshedSurface<Face>& surf
         );
 
 };
@@ -570,7 +571,6 @@ template<>
 bool MeshedSurface<labelledTri>::addZonesToFaces();
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
index 6757e62c09..c9a93b1ef3 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 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.
@@ -92,22 +92,14 @@ void Foam::MeshedSurface<Face>::writeStats(Ostream& os) const
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Face>
-Foam::Istream& Foam::operator>>
-(
-    Foam::Istream& is,
-    Foam::MeshedSurface<Face>& surf
-)
+Foam::Istream& Foam::operator>>(Istream& is, MeshedSurface<Face>& surf)
 {
     return surf.read(is);
 }
 
 
 template<class Face>
-Foam::Ostream& Foam::operator<<
-(
-    Foam::Ostream& os,
-    const Foam::MeshedSurface<Face>& surf
-)
+Foam::Ostream& Foam::operator<<(Ostream& os, const MeshedSurface<Face>& surf)
 {
     return surf.write(os);
 }
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index ae18f3b9bb..d5e1490105 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -48,8 +48,8 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
         if (delegate.found(ext))
         {
             // Create indirectly
-            autoPtr<MeshedSurface<Face>> surf(new MeshedSurface<Face>);
-            surf().transfer(FriendType::New(name, ext)());
+            auto surf = autoPtr<MeshedSurface<Face>>::New();
+            surf().transfer(*(FriendType::New(name, ext)));
 
             return surf;
         }
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 6a24f38de1..938fe0fece 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -65,13 +65,13 @@ void Foam::MeshedSurface<Face>::checkZones()
 template<class Face>
 void Foam::MeshedSurface<Face>::sortFacesAndStore
 (
-    const Xfer<List<Face>>& unsortedFaces,
-    const Xfer<List<label>>& zoneIds,
+    DynamicList<Face>& unsortedFaces,
+    DynamicList<label>& zoneIds,
     const bool sorted
 )
 {
-    List<Face>  oldFaces(unsortedFaces);
-    List<label> zones(zoneIds);
+    List<Face>  oldFaces(std::move(unsortedFaces));
+    List<label> zones(std::move(zoneIds));
 
     if (sorted)
     {
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index fd5e7dd935..85998b80f2 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -42,12 +42,9 @@ Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
 
 Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
 (
-    const IOobject& ioPoints,
-    const pointField& points,
-    const IOobject& ioFaces,
-    const faceList& faces,
-    const IOobject& ioZones,
-    const surfZoneList& zones
+    const IOobject& ioPoints, const pointField& points,
+    const IOobject& ioFaces,  const faceList& faces,
+    const IOobject& ioZones,  const surfZoneList& zones
 )
 :
     points_(ioPoints, points),
@@ -58,17 +55,14 @@ Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
 
 Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
 (
-    const IOobject& ioPoints,
-    const Xfer<pointField>& points,
-    const IOobject& ioFaces,
-    const Xfer<faceList>& faces,
-    const IOobject& ioZones,
-    const Xfer<surfZoneList>& zones
+    const IOobject& ioPoints, pointField&& points,
+    const IOobject& ioFaces,  faceList&& faces,
+    const IOobject& ioZones,  surfZoneList&& zones
 )
 :
-    points_(ioPoints, points),
-    faces_(ioFaces, faces),
-    zones_(ioZones, zones)
+    points_(ioPoints, std::move(points)),
+    faces_(ioFaces, std::move(faces)),
+    zones_(ioZones, std::move(zones))
 {}
 
 
@@ -90,11 +84,11 @@ void Foam::MeshedSurfaceIOAllocator::setInstance(const fileName& inst)
 }
 
 
-void Foam::MeshedSurfaceIOAllocator::setWriteOption(IOobject::writeOption w)
+void Foam::MeshedSurfaceIOAllocator::setWriteOption(IOobject::writeOption wOpt)
 {
-    points_.writeOpt() = w;
-    faces_.writeOpt()  = w;
-    zones_.writeOpt()  = w;
+    points_.writeOpt() = wOpt;
+    faces_.writeOpt()  = wOpt;
+    zones_.writeOpt()  = wOpt;
 }
 
 
@@ -106,60 +100,6 @@ void Foam::MeshedSurfaceIOAllocator::clear()
 }
 
 
-void Foam::MeshedSurfaceIOAllocator::resetFaces
-(
-    const Xfer<List<face>>& faces,
-    const Xfer<surfZoneList>& zones
-)
-{
-    if (notNull(faces))
-    {
-        faces_.transfer(faces());
-    }
-
-    if (notNull(zones))
-    {
-        zones_.transfer(zones());
-    }
-}
-
-
-void Foam::MeshedSurfaceIOAllocator::reset
-(
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<surfZoneList>& zones
-)
-{
-    // Take over new primitive data.
-    // Optimized to avoid overwriting data at all
-    if (notNull(points))
-    {
-        points_.transfer(points());
-    }
-
-    resetFaces(faces, zones);
-}
-
-
-void Foam::MeshedSurfaceIOAllocator::reset
-(
-    const Xfer<List<point>>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<surfZoneList>& zones
-)
-{
-    // Take over new primitive data.
-    // Optimized to avoid overwriting data at all
-    if (notNull(points))
-    {
-        points_.transfer(points());
-    }
-
-    resetFaces(faces, zones);
-}
-
-
 bool Foam::MeshedSurfaceIOAllocator::writeObject
 (
     IOstream::streamFormat fmt,
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index fd4bca6446..90adcf7b76 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -64,10 +64,10 @@ class MeshedSurfaceIOAllocator
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- Disallow copy construct
         MeshedSurfaceIOAllocator(const MeshedSurfaceIOAllocator&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- Disallow copy assignment
         void operator=(const MeshedSurfaceIOAllocator&) = delete;
 
 
@@ -86,23 +86,17 @@ public:
         //- Construct from IOobjects, copying components
         MeshedSurfaceIOAllocator
         (
-            const IOobject& ioPoints,
-            const pointField& points,
-            const IOobject& ioFaces,
-            const faceList& faces,
-            const IOobject& ioZones,
-            const surfZoneList& zones
+            const IOobject& ioPoints, const pointField& points,
+            const IOobject& ioFaces,  const faceList& faces,
+            const IOobject& ioZones,  const surfZoneList& zones
         );
 
-        //- Construct from IOobjects, possibly transferring components
+        //- Construct from IOobjects, moving components
         MeshedSurfaceIOAllocator
         (
-            const IOobject& ioPoints,
-            const Xfer<pointField>& points,
-            const IOobject& ioFaces,
-            const Xfer<faceList>& faces,
-            const IOobject& ioZones,
-            const Xfer<surfZoneList>& zones
+            const IOobject& ioPoints, pointField&& points,
+            const IOobject& ioFaces,  faceList&& faces,
+            const IOobject& ioZones,  surfZoneList&& zones
         );
 
 
@@ -112,96 +106,70 @@ public:
 
     // Member Functions
 
-        // Database
+    // Database
 
-            //- Set the instance for mesh files
-            void setInstance(const fileName&);
+        //- Set the instance for mesh files
+        void setInstance(const fileName& inst);
 
-            //- Adjust the write option for all components
-            void setWriteOption(IOobject::writeOption);
+        //- Adjust the write option for all components
+        void setWriteOption(IOobject::writeOption wOpt);
 
 
-        // Access
+   // Access
 
-            //- Non-const access to the points
-            pointIOField& storedIOPoints()
-            {
-                return points_;
-            }
+       //- Non-const access to the points
+       pointIOField& storedIOPoints()
+       {
+           return points_;
+       }
 
-            //- Non-const access to the faces
-            faceCompactIOList& storedIOFaces()
-            {
-                return faces_;
-            }
+       //- Non-const access to the faces
+       faceCompactIOList& storedIOFaces()
+       {
+           return faces_;
+       }
 
-            //- Non-const access to the zones
-            surfZoneIOList& storedIOZones()
-            {
-                return zones_;
-            }
+       //- Non-const access to the zones
+       surfZoneIOList& storedIOZones()
+       {
+           return zones_;
+       }
 
-            //- Const access to the points
-            const pointIOField& storedIOPoints() const
-            {
-                return points_;
-            }
+       //- Const access to the points
+       const pointIOField& storedIOPoints() const
+       {
+           return points_;
+       }
 
-            //- Const access to the faces
-            const faceCompactIOList& storedIOFaces() const
-            {
-                return faces_;
-            }
+       //- Const access to the faces
+       const faceCompactIOList& storedIOFaces() const
+       {
+           return faces_;
+       }
 
-            //- Const access to the zones
-            const surfZoneIOList& storedIOZones() const
-            {
-                return zones_;
-            }
+       //- Const access to the zones
+       const surfZoneIOList& storedIOZones() const
+       {
+           return zones_;
+       }
 
 
-        //  Storage management
+   //  Storage Management
 
-            //- Clear primitive data (points, faces and zones)
-            void clear();
-
-            //- Reset primitive data (faces and zones)
-            //  Note, optimized to avoid overwriting data (with Xfer::null)
-            void resetFaces
-            (
-                const Xfer<faceList>& faces,
-                const Xfer<surfZoneList>& zones
-            );
-
-            //- Reset primitive data (points, faces and zones)
-            //  Note, optimized to avoid overwriting data (with Xfer::null)
-            void reset
-            (
-                const Xfer<pointField>& points,
-                const Xfer<faceList>& faces,
-                const Xfer<surfZoneList>& zones
-            );
-
-            //- Reset primitive data (points, faces and zones)
-            //  Note, optimized to avoid overwriting data (with Xfer::null)
-            void reset
-            (
-                const Xfer<List<point>>& points,
-                const Xfer<faceList>& faces,
-                const Xfer<surfZoneList>& zones
-            );
+       //- Clear primitive data (points, faces and zones)
+       void clear();
 
 
-        // Writing
+   // Writing
 
-            //- Write using given format, version and compression
-            virtual bool writeObject
-            (
-                IOstream::streamFormat,
-                IOstream::versionNumber,
-                IOstream::compressionType,
-                const bool valid
-            ) const;
+       //- Write using given format, version and compression
+       virtual bool writeObject
+       (
+           IOstream::streamFormat fmt,
+           IOstream::versionNumber ver,
+           IOstream::compressionType cmp,
+           const bool valid
+       ) const;
 
 };
 
diff --git a/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H b/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H
index 5489558f20..5eb1db9065 100644
--- a/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H
+++ b/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,10 +54,10 @@ class ModifiableMeshedSurface
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- Disallow copy construct
         ModifiableMeshedSurface(const ModifiableMeshedSurface<Face>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- Disallow copy assignment
         void operator=(const ModifiableMeshedSurface<Face>&) = delete;
 
 
@@ -65,7 +65,7 @@ public:
 
     // Constructors
 
-        //- Construct null, use reset/transfer to adjust contents
+        //- Construct null. Use swap or transfer to manage content
         ModifiableMeshedSurface()
         :
             MeshedSurface<Face>()
@@ -73,12 +73,9 @@ public:
 
 
         //- Construct by transferring the contents from a MeshedSurface
-        explicit ModifiableMeshedSurface
-        (
-            const Xfer<MeshedSurface<Face>>& surf
-        )
+        explicit ModifiableMeshedSurface(MeshedSurface<Face>&& surf)
         :
-            MeshedSurface<Face>(surf)
+            MeshedSurface<Face>(std::move(surf))
         {}
 
 
@@ -88,12 +85,13 @@ public:
 
     // Member Functions
 
-        // Edit
+        // Expose various protected methods
+        using MeshedSurface<Face>::storedFaces;
+        using MeshedSurface<Face>::storedPoints;
+        using MeshedSurface<Face>::storedZones;
 
-            // Expose protected methods
-            using MeshedSurface<Face>::storedFaces;
-            using MeshedSurface<Face>::storedPoints;
-            using MeshedSurface<Face>::storedZones;
+        //- Copy and Move assignments
+        using MeshedSurface<Face>::operator=;
 
 };
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 543b7c75ce..6d601ffdf9 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -52,7 +52,7 @@ template<class Face>
 bool Foam::UnsortedMeshedSurface<Face>::canReadType
 (
     const word& ext,
-    const bool verbose
+    bool verbose
 )
 {
    return fileFormats::surfaceFormatsCore::checkSupport
@@ -69,7 +69,7 @@ template<class Face>
 bool Foam::UnsortedMeshedSurface<Face>::canWriteType
 (
     const word& ext,
-    const bool verbose
+    bool verbose
 )
 {
     return fileFormats::surfaceFormatsCore::checkSupport
@@ -86,7 +86,7 @@ template<class Face>
 bool Foam::UnsortedMeshedSurface<Face>::canRead
 (
     const fileName& name,
-    const bool verbose
+    bool verbose
 )
 {
     word ext = name.ext();
@@ -160,61 +160,13 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface()
 {}
 
 
-template<class Face>
-Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<List<label>>& zoneIds,
-    const Xfer<surfZoneIdentifierList>& zoneTofc
-)
-:
-    ParentType(pointLst, faceLst),
-    zoneIds_(zoneIds),
-    zoneToc_(zoneTofc)
-{}
-
-
-template<class Face>
-Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
-(
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const labelUList& zoneSizes,
-    const UList<word>& zoneNames
-)
-:
-    ParentType(pointLst, faceLst)
-{
-    if (zoneSizes.size())
-    {
-        if (zoneNames.size())
-        {
-            setZones(zoneSizes, zoneNames);
-        }
-        else
-        {
-            setZones(zoneSizes);
-        }
-    }
-    else
-    {
-        setOneZone();
-    }
-}
-
-
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
     const UnsortedMeshedSurface<Face>& surf
 )
 :
-    ParentType
-    (
-        xferCopy(surf.points()),
-        xferCopy(surf.surfFaces())
-    ),
+    ParentType(surf.points(), surf.surfFaces()), // Copy construct (no zones)
     zoneIds_(surf.zoneIds()),
     zoneToc_(surf.zoneToc())
 {}
@@ -226,11 +178,9 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
     const MeshedSurface<Face>& surf
 )
 :
-    ParentType
-    (
-        xferCopy(surf.points()),
-        xferCopy(surf.surfFaces())
-    )
+    ParentType(surf.points(), surf.surfFaces()), // Copy construct (no zones)
+    zoneIds_(),
+    zoneToc_()
 {
     setZones(surf.surfZones());
 }
@@ -239,27 +189,42 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
-    const Xfer<UnsortedMeshedSurface<Face>>& surf
+    UnsortedMeshedSurface<Face>&& surf
 )
 :
     UnsortedMeshedSurface<Face>()
 {
-    transfer(surf());
+    transfer(surf);
 }
 
 
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
-    const Xfer<MeshedSurface<Face>>& surf
+    MeshedSurface<Face>&& surf
 )
 :
     UnsortedMeshedSurface<Face>()
 {
-    transfer(surf());
+    transfer(surf);
 }
 
 
+template<class Face>
+Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
+(
+    pointField&& pointLst,
+    List<Face>&& faceLst,
+    List<label>&& zoneIds,
+    UList<surfZoneIdentifier>& tocInfo
+)
+:
+    ParentType(std::move(pointLst), std::move(faceLst)),
+    zoneIds_(std::move(zoneIds)),
+    zoneToc_(tocInfo)
+{}
+
+
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 (
@@ -316,7 +281,9 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::setOneZone()
 {
-    zoneIds_.setSize(size());
+    this->removeZones(); // Parent information is unreliable
+
+    zoneIds_.resize(size());
     zoneIds_ = 0;
 
     word zoneName;
@@ -329,8 +296,9 @@ void Foam::UnsortedMeshedSurface<Face>::setOneZone()
         zoneName = "zone0";
     }
 
-    // Set single default zone
-    zoneToc_ = { surfZoneIdentifier(zoneName, 0) };
+    // Assign single default zone
+    zoneToc_.resize(1);
+    zoneToc_[0] = surfZoneIdentifier(zoneName, 0);
 }
 
 
@@ -340,17 +308,18 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
     const surfZoneList& zoneLst
 )
 {
-    zoneIds_.setSize(size());
-    zoneToc_.setSize(zoneLst.size());
+    this->removeZones(); // Parent information is unreliable
 
-    forAll(zoneToc_, zoneI)
+    zoneIds_.resize(size());
+    zoneToc_.resize(zoneLst.size());
+
+    forAll(zoneToc_, zonei)
     {
-        const surfZone& zone = zoneLst[zoneI];
-        zoneToc_[zoneI] = zone;
+        const surfZone& zone = zoneLst[zonei];
+        zoneToc_[zonei] = zone;
 
-        // assign sub-zone Ids
-        SubList<label> subZone(zoneIds_, zone.size(), zone.start());
-        subZone = zoneI;
+        // Assign sub-zone Ids
+        SubList<label>(zoneIds_, zone.size(), zone.start()) = zonei;
     }
 }
 
@@ -362,19 +331,20 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
     const UList<word>& names
 )
 {
-    zoneIds_.setSize(size());
-    zoneToc_.setSize(sizes.size());
+    this->removeZones(); // Parent information is unreliable
+
+    zoneIds_.resize(size());
+    zoneToc_.resize(sizes.size());
 
     label start = 0;
-    forAll(zoneToc_, zoneI)
+    forAll(zoneToc_, zonei)
     {
-        zoneToc_[zoneI] = surfZoneIdentifier(names[zoneI], zoneI);
+        zoneToc_[zonei] = surfZoneIdentifier(names[zonei], zonei);
 
-        // assign sub-zone Ids
-        SubList<label> subZone(zoneIds_, sizes[zoneI], start);
-        subZone = zoneI;
+        // Assign sub-zone Ids
+        SubList<label>(zoneIds_, sizes[zonei], start) = zonei;
 
-        start += sizes[zoneI];
+        start += sizes[zonei];
     }
 }
 
@@ -385,23 +355,24 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
     const labelUList& sizes
 )
 {
-    zoneIds_.setSize(size());
-    zoneToc_.setSize(sizes.size());
+    this->removeZones(); // Parent information is unreliable
+
+    zoneIds_.resize(size());
+    zoneToc_.resize(sizes.size());
 
     label start = 0;
-    forAll(zoneToc_, zoneI)
+    forAll(zoneToc_, zonei)
     {
-        zoneToc_[zoneI] = surfZoneIdentifier
+        zoneToc_[zonei] = surfZoneIdentifier
         (
-            word("zone") + ::Foam::name(zoneI),
-            zoneI
+            word("zone") + ::Foam::name(zonei),
+            zonei
         );
 
-        // assign sub-zone Ids
-        SubList<label> subZone(zoneIds_, sizes[zoneI], start);
-        subZone = zoneI;
+        // Assign sub-zone Ids
+        SubList<label>(zoneIds_, sizes[zonei], start) = zonei;
 
-        start += sizes[zoneI];
+        start += sizes[zonei];
     }
 }
 
@@ -412,7 +383,7 @@ void Foam::UnsortedMeshedSurface<Face>::remapFaces
     const labelUList& faceMap
 )
 {
-    // re-assign the zone Ids
+    // Re-assign the zone Ids
     if (isNull(faceMap) || faceMap.empty())
     {
         return;
@@ -468,9 +439,9 @@ Foam::Ostream& Foam::UnsortedMeshedSurface<Face>::write(Ostream& os) const
 template<class Face>
 void Foam::UnsortedMeshedSurface<Face>::setSize(const label s)
 {
-    this->storedFaces().setSize(s);
+    this->storedFaces().resize(s);
     // if zones extend: set with last zoneId
-    zoneIds_.setSize(s, zoneToc_.size() - 1);
+    zoneIds_.resize(s, zoneToc_.size() - 1);
 }
 
 
@@ -491,9 +462,9 @@ Foam::surfZoneList Foam::UnsortedMeshedSurface<Face>::sortedZones
 {
     // supply some zone names
     Map<word> zoneNames;
-    forAll(zoneToc_, zoneI)
+    forAll(zoneToc_, zonei)
     {
-        zoneNames.insert(zoneI, zoneToc_[zoneI].name());
+        zoneNames.insert(zonei, zoneToc_[zonei].name());
     }
 
     // std::sort() really seems to mix up the order.
@@ -502,7 +473,7 @@ Foam::surfZoneList Foam::UnsortedMeshedSurface<Face>::sortedZones
     // Assuming that we have relatively fewer zones compared to the
     // number of items, just do it ourselves
 
-    // step 1: get zone sizes and store (origId => zoneI)
+    // Step 1: get zone sizes and store (origId => zoneI)
     Map<label> lookup;
     forAll(zoneIds_, facei)
     {
@@ -519,7 +490,7 @@ Foam::surfZoneList Foam::UnsortedMeshedSurface<Face>::sortedZones
         }
     }
 
-    // step 2: assign start/size (and name) to the newZones
+    // Step 2: assign start/size (and name) to the newZones
     // re-use the lookup to map (zoneId => zoneI)
     surfZoneList zoneLst(lookup.size());
     label start = 0;
@@ -554,16 +525,16 @@ Foam::surfZoneList Foam::UnsortedMeshedSurface<Face>::sortedZones
     }
 
 
-    // step 3: build the re-ordering
-    faceMap.setSize(zoneIds_.size());
+    // Step 3: build the re-ordering
+    faceMap.resize(zoneIds_.size());
 
     forAll(zoneIds_, facei)
     {
-        label zoneI = lookup[zoneIds_[facei]];
-        faceMap[facei] = zoneLst[zoneI].start() + zoneLst[zoneI].size()++;
+        label zonei = lookup[zoneIds_[facei]];
+        faceMap[facei] = zoneLst[zonei].start() + zoneLst[zonei].size()++;
     }
 
-    // with reordered faces registered in faceMap
+    // With reordered faces registered in faceMap
     return zoneLst;
 }
 
@@ -612,13 +583,16 @@ Foam::UnsortedMeshedSurface<Face>::subsetMesh
     }
     oldToNew.clear();
 
-    // construct a sub-surface
-    return UnsortedMeshedSurface
+    // Retain the same zone toc information
+    List<surfZoneIdentifier> subToc(zoneToc_);
+
+    // Return sub-surface
+    return UnsortedMeshedSurface<Face>
     (
-        xferMove(newPoints),
-        xferMove(newFaces),
-        xferMove(newZones),
-        xferCopy(zoneToc_)
+        std::move(newPoints),
+        std::move(newFaces),
+        std::move(newZones),
+        std::move(subToc)
     );
 }
 
@@ -635,46 +609,21 @@ Foam::UnsortedMeshedSurface<Face> Foam::UnsortedMeshedSurface<Face>::subsetMesh
 
 
 template<class Face>
-void Foam::UnsortedMeshedSurface<Face>::reset
+void Foam::UnsortedMeshedSurface<Face>::swap
 (
-    const Xfer<pointField>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<List<label>>& zoneIds
+    UnsortedMeshedSurface<Face>& surf
 )
 {
-    ParentType::reset
-    (
-        pointLst,
-        faceLst,
-        Xfer<surfZoneList>()
-    );
+    this->clearOut();  // Topology changes
+    surf.clearOut();   // Topology changes
 
-    if (notNull(zoneIds))
-    {
-        zoneIds_.transfer(zoneIds());
-    }
-}
+    this->storedPoints().swap(surf.storedPoints());
+    this->storedFaces().swap(surf.storedFaces());
+    zoneIds_.swap(surf.zoneIds_);
+    zoneToc_.swap(surf.zoneToc_);
 
-
-template<class Face>
-void Foam::UnsortedMeshedSurface<Face>::reset
-(
-    const Xfer<List<point>>& pointLst,
-    const Xfer<List<Face>>& faceLst,
-    const Xfer<List<label>>& zoneIds
-)
-{
-    ParentType::reset
-    (
-        pointLst,
-        faceLst,
-        Xfer<surfZoneList>()
-    );
-
-    if (notNull(zoneIds))
-    {
-        zoneIds_.transfer(zoneIds());
-    }
+    this->storedZones().clear(); // Should not be there anyhow
+    surf.storedZones().clear();
 }
 
 
@@ -684,13 +633,10 @@ void Foam::UnsortedMeshedSurface<Face>::transfer
     UnsortedMeshedSurface<Face>& surf
 )
 {
-    ParentType::reset
-    (
-        xferMove(surf.storedPoints()),
-        xferMove(surf.storedFaces()),
-        Xfer<surfZoneList>()
-    );
+    this->clear();
 
+    this->storedPoints().transfer(surf.storedPoints());
+    this->storedFaces().transfer(surf.storedFaces());
     zoneIds_.transfer(surf.zoneIds_);
     zoneToc_.transfer(surf.zoneToc_);
 
@@ -704,31 +650,18 @@ void Foam::UnsortedMeshedSurface<Face>::transfer
     MeshedSurface<Face>& surf
 )
 {
-    ParentType::reset
-    (
-        xferMove(surf.storedPoints()),
-        xferMove(surf.storedFaces()),
-        Xfer<surfZoneList>()
-    );
+    surfZoneList zoneInfo(surf.surfZones());
+    ParentType::transfer(surf);
 
-    setZones(surf.surfZones());
-    surf.clear();
+    setZones(zoneInfo);
 }
 
 
 template<class Face>
-Foam::Xfer<Foam::UnsortedMeshedSurface<Face>>
-Foam::UnsortedMeshedSurface<Face>::xfer()
+Foam::autoPtr<Foam::labelList>
+Foam::UnsortedMeshedSurface<Face>::releaseZoneIds()
 {
-    return xferMove(*this);
-}
-
-
-template<class Face>
-Foam::Xfer<Foam::labelList>
-Foam::UnsortedMeshedSurface<Face>::xferZoneIds()
-{
-    return this->storedZoneIds().xfer();
+    return autoPtr<labelList>::New(this->storedZoneIds());
 }
 
 
@@ -791,6 +724,16 @@ void Foam::UnsortedMeshedSurface<Face>::operator=
 }
 
 
+template<class Face>
+void Foam::UnsortedMeshedSurface<Face>::operator=
+(
+    UnsortedMeshedSurface<Face>&& surf
+)
+{
+    transfer();
+}
+
+
 template<class Face>
 Foam::UnsortedMeshedSurface<Face>::operator
 Foam::MeshedSurfaceProxy<Face>() const
@@ -813,8 +756,8 @@ Foam::MeshedSurfaceProxy<Face>() const
 template<class Face>
 Foam::Istream& Foam::operator>>
 (
-    Foam::Istream& is,
-    Foam::UnsortedMeshedSurface<Face>& surf
+    Istream& is,
+    UnsortedMeshedSurface<Face>& surf
 )
 {
     return surf.read(is);
@@ -824,8 +767,8 @@ Foam::Istream& Foam::operator>>
 template<class Face>
 Foam::Ostream& Foam::operator<<
 (
-    Foam::Ostream& os,
-    const Foam::UnsortedMeshedSurface<Face>& surf
+    Ostream& os,
+    const UnsortedMeshedSurface<Face>& surf
 )
 {
     return surf.write(os);
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 013417ac6a..74a5501cbf 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -59,8 +59,8 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
-
+// Forward declarations
+//
 class Time;
 class Istream;
 class Ostream;
@@ -83,9 +83,11 @@ class UnsortedMeshedSurface
 :
     public MeshedSurface<Face>
 {
-    // friends - despite different face representations
+    // Friends, regardless of face representations
     template<class Face2> friend class MeshedSurface;
     template<class Face2> friend class UnsortedMeshedSurface;
+
+    // Friendship with surfMesh is needed for transferring
     friend class surfMesh;
 
 private:
@@ -154,14 +156,14 @@ public:
 
     // Static
 
-        //- Can we read this file format?
-        static bool canReadType(const word& ext, const bool verbose=false);
+        //- Can we read this file format type?
+        static bool canReadType(const word& ext, bool verbose=false);
 
         //- Can we read this file format?
-        static bool canRead(const fileName&, const bool verbose=false);
+        static bool canRead(const fileName& name, bool verbose=false);
 
-        //- Can we write this file format?
-        static bool canWriteType(const word& ext, const bool verbose=false);
+        //- Can we write this file format type?
+        static bool canWriteType(const word& ext, bool verbose=false);
 
         //- Known readable file-types
         static wordHashSet readTypes();
@@ -175,51 +177,41 @@ public:
         //- Construct null
         UnsortedMeshedSurface();
 
-        //- Construct by transferring components
-        //  (points, faces, zone ids, zone info).
-        UnsortedMeshedSurface
-        (
-            const Xfer<pointField>&,
-            const Xfer<List<Face>>&,
-            const Xfer<List<label>>& zoneIds,
-            const Xfer<surfZoneIdentifierList>&
-        );
-
-        //- Construct by transferring points, faces.
-        //  Use zone information, or set single default zone
-        UnsortedMeshedSurface
-        (
-            const Xfer<pointField>&,
-            const Xfer<List<Face>>&,
-            const labelUList& zoneSizes = labelUList(),
-            const UList<word>& zoneNames = UList<word>()
-        );
-
         //- Construct as copy
-        UnsortedMeshedSurface(const UnsortedMeshedSurface<Face>&);
+        UnsortedMeshedSurface(const UnsortedMeshedSurface<Face>& surf);
 
-        //- Construct from a meshedSurface
-        UnsortedMeshedSurface(const MeshedSurface<Face>&);
+        //- Construct from a MeshedSurface
+        UnsortedMeshedSurface(const MeshedSurface<Face>& surf);
 
-        //- Construct by transferring the contents from a UnsortedMeshedSurface
-        UnsortedMeshedSurface(const Xfer<UnsortedMeshedSurface<Face>>&);
+        //- Move construct from a UnsortedMeshedSurface
+        UnsortedMeshedSurface(UnsortedMeshedSurface<Face>&& surf);
 
-        //- Construct by transferring the contents from a meshedSurface
-        UnsortedMeshedSurface(const Xfer<MeshedSurface<Face>>&);
+        //- Move construct from MeshedSurface
+        UnsortedMeshedSurface(MeshedSurface<Face>&& surf);
+
+        //- Move construct from components (points, faces, zone ids).
+        //  Zone information is fairly lightweight and is copied.
+        UnsortedMeshedSurface
+        (
+            pointField&& pointLst,
+            List<Face>&& faceLst,
+            List<label>&& zoneIds,
+            UList<surfZoneIdentifier>& tocInfo
+        );
 
         //- Construct from file name (uses extension to determine type)
-        UnsortedMeshedSurface(const fileName&);
+        UnsortedMeshedSurface(const fileName& name);
 
         //- Construct from file name (uses extension to determine type)
-        UnsortedMeshedSurface(const fileName&, const word&);
+        UnsortedMeshedSurface(const fileName& name, const word& ext);
 
         //- Construct from Istream
-        UnsortedMeshedSurface(Istream&);
+        UnsortedMeshedSurface(Istream& is);
 
         //- Construct from objectRegistry and a named surface
         UnsortedMeshedSurface
         (
-            const Time&,
+            const Time& t,
             const word& surfName = word::null
         );
 
@@ -291,134 +283,123 @@ public:
 
     // Member Functions
 
-        // Access
+    // Access
 
-            //- The surface size is the number of faces
-            label size() const
-            {
-                return ParentType::size();
-            }
+        //- The surface size is the number of faces
+        label size() const
+        {
+            return ParentType::size();
+        }
 
-            //- Reset size of face and zone list
-            void setSize(const label);
+        //- Reset size of face and zone list
+        void setSize(const label);
 
-            //- Return const access to the zone ids
-            virtual const labelList& zoneIds() const
-            {
-                return zoneIds_;
-            }
+        //- Return const access to the zone ids
+        virtual const labelList& zoneIds() const
+        {
+            return zoneIds_;
+        }
 
-            //- Return const access to the zone table-of-contents
-            const List<surfZoneIdentifier>& zoneToc() const
-            {
-                return zoneToc_;
-            }
+        //- Return const access to the zone table-of-contents
+        const List<surfZoneIdentifier>& zoneToc() const
+        {
+            return zoneToc_;
+        }
 
-            //- Sort faces according to zoneIds
-            //  Returns a surfZoneList and sets faceMap to index within faces()
-            //  (i.e. map from original,unsorted to sorted)
-            surfZoneList sortedZones(labelList& faceMap) const;
+        //- Sort faces according to zoneIds
+        //  Returns a surfZoneList and sets faceMap to index within faces()
+        //  (i.e. map from original,unsorted to sorted)
+        surfZoneList sortedZones(labelList& faceMap) const;
 
-            //- Set zones to 0 and set a single zone
-            void setOneZone();
+        //- Set zones to 0 and set a single zone
+        void setOneZone();
 
-            //- Set zone ids and zones
-            void setZones(const surfZoneList&);
+        //- Set zone ids and zones
+        void setZones(const surfZoneList& zoneLst);
 
-            //- Set zone ids and zones
-            void setZones(const labelUList& sizes, const UList<word>& names);
+        //- Set zone ids and zones
+        void setZones(const labelUList& sizes, const UList<word>& names);
 
-            //- Set zone ids and zones with default names
-            void setZones(const labelUList& sizes);
+        //- Set zone ids and zones with default names
+        void setZones(const labelUList& sizes);
 
 
-        // Edit
+    // Edit
 
-            //- Clear all storage
-            virtual void clear();
+        //- Clear all storage
+        virtual void clear();
 
-            //- Return new surface.
-            //  Returns return pointMap, faceMap from subsetMeshMap
-            UnsortedMeshedSurface subsetMesh
-            (
-                const labelHashSet& include,
-                labelList& pointMap,
-                labelList& faceMap
-            ) const;
+        //- Return new surface.
+        //  Returns return pointMap, faceMap from subsetMeshMap
+        UnsortedMeshedSurface subsetMesh
+        (
+            const labelHashSet& include,
+            labelList& pointMap,
+            labelList& faceMap
+        ) const;
 
-            //- Return new surface.
-            UnsortedMeshedSurface subsetMesh
-            (
-                const labelHashSet& include
-            ) const;
-
-            //- Inherit reset from MeshedSurface<Face>
-            using MeshedSurface<Face>::reset;
-
-            //- Transfer components (points, faces, zone ids).
-            virtual void reset
-            (
-                const Xfer<pointField>&,
-                const Xfer<List<Face>>&,
-                const Xfer<List<label>>& zoneIds
-            );
-
-            //- Transfer components (points, faces, zone ids).
-            virtual void reset
-            (
-                const Xfer<List<point>>&,
-                const Xfer<List<Face>>&,
-                const Xfer<List<label>>& zoneIds
-            );
-
-            //- Transfer the contents of the argument and annul the argument
-            void transfer(UnsortedMeshedSurface<Face>&);
-
-            //- Transfer the contents of the argument and annul the argument
-            void transfer(MeshedSurface<Face>&);
-
-            //- Transfer contents to the Xfer container
-            Xfer<UnsortedMeshedSurface<Face>> xfer();
-
-            //- Transfer stored zoneIds to an Xfer container
-            Xfer<labelList> xferZoneIds();
+        //- Return new surface.
+        UnsortedMeshedSurface subsetMesh
+        (
+            const labelHashSet& include
+        ) const;
 
 
-        // Read
+        //- Swap contents - disabled
+        void swap(MeshedSurface<Face>& surf) = delete;
 
-            //- Read from file. Chooses reader based on explicit extension
-            bool read(const fileName&, const word& ext);
+        //- Swap contents
+        void swap(UnsortedMeshedSurface<Face>& surf);
 
-            //- Read from file. Chooses reader based on detected extension
-            virtual bool read(const fileName&);
+        //- Transfer the contents of the argument and annul the argument
+        void transfer(UnsortedMeshedSurface<Face>& surf);
+
+        //- Transfer the contents of the argument and annul the argument
+        void transfer(MeshedSurface<Face>& surf);
+
+        //- Release (clear) stored zoneIds and return for reuse
+        autoPtr<labelList> releaseZoneIds();
 
 
-        // Write
+    // Read
 
-            //- Generic write routine. Chooses writer based on its extension.
-            virtual void write
-            (
-                const fileName& name,
-                const dictionary& options = dictionary::null
-            ) const
-            {
-                write(name, *this, options);
-            }
+        //- Read from file. Chooses reader based on explicit extension
+        bool read(const fileName& name, const word& ext);
 
-            //- Write to database
-            void write
-            (
-                const Time& t,
-                const word& surfName = word::null
-            ) const;
+        //- Read from file. Chooses reader based on detected extension
+        virtual bool read(const fileName& name);
 
 
-        // Member operators
+    // Write
 
-            void operator=(const UnsortedMeshedSurface<Face>&);
+        //- Generic write routine. Chooses writer based on its extension.
+        virtual void write
+        (
+            const fileName& name,
+            const dictionary& options = dictionary::null
+        ) const
+        {
+            write(name, *this, options);
+        }
 
-            //- Conversion operator to MeshedSurfaceProxy
-            operator MeshedSurfaceProxy<Face>() const;
+        //- Write to database
+        void write
+        (
+            const Time& t,
+            const word& surfName = word::null
+        ) const;
+
+
+    // Member Operators
+
+        //- Copy assigment
+        void operator=(const UnsortedMeshedSurface<Face>& surf);
+
+        //- Move assigment
+        void operator=(UnsortedMeshedSurface<Face>&& surf);
+
+        //- Conversion operator to MeshedSurfaceProxy
+        operator MeshedSurfaceProxy<Face>() const;
 
 
     // IOstream Operators
@@ -427,17 +408,16 @@ public:
         //  Avoid using to read/write file content (fragile).
         friend Istream& operator>> <Face>
         (
-            Istream&,
-            UnsortedMeshedSurface<Face>&
+            Istream& is,
+            UnsortedMeshedSurface<Face>& surf
         );
 
-
         //- Write UnsortedMeshedSurface to Ostream.
         //  Avoid using to read/write file content (fragile).
         friend Ostream& operator<< <Face>
         (
-            Ostream&,
-            const UnsortedMeshedSurface<Face>&
+            Ostream& os,
+            const UnsortedMeshedSurface<Face>& surf
         );
 };
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 34b17c66a3..a3f15fa5a2 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -51,11 +51,8 @@ Foam::UnsortedMeshedSurface<Face>::New
         if (delegate.found(ext))
         {
             // Create indirectly
-            autoPtr<UnsortedMeshedSurface<Face>> surf
-            (
-                new UnsortedMeshedSurface<Face>
-            );
-            surf().transfer(ParentType::New(name, ext)());
+            auto surf = autoPtr<UnsortedMeshedSurface<Face>>::New();
+            surf().transfer(*(ParentType::New(name, ext)));
 
             return surf;
         }
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index b06052a3a7..b3558c6348 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,10 +35,9 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(surfMesh, 0);
+  defineTypeNameAndDebug(surfMesh, 0);
 }
 
-
 Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -71,6 +70,12 @@ Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::surfMesh::surfMesh(const IOobject& io)
+:
+    surfMesh(io, io.name())
+{}
+
+
 Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName)
 :
     surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
@@ -111,8 +116,7 @@ Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName)
 Foam::surfMesh::surfMesh
 (
     const IOobject& io,
-    const Xfer<pointField>& pointLst,
-    const Xfer<faceList>& faceLst,
+    const MeshedSurface<face>& surf,
     const word& surfName
 )
 :
@@ -128,7 +132,6 @@ Foam::surfMesh::surfMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        pointLst,
         IOobject
         (
             "faces",
@@ -138,7 +141,6 @@ Foam::surfMesh::surfMesh
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        faceLst,
         IOobject
         (
             "surfZones",
@@ -147,53 +149,7 @@ Foam::surfMesh::surfMesh
             *this,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
-        ),
-        Xfer<surfZoneList>()
-    ),
-    MeshReference(this->storedIOFaces(), this->storedIOPoints())
-{}
-
-
-Foam::surfMesh::surfMesh
-(
-    const IOobject& io,
-    const Xfer<MeshedSurface<face>>& surf,
-    const word& surfName
-)
-:
-    surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
-    Allocator
-    (
-        IOobject
-        (
-            "points",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pointField(),
-        IOobject
-        (
-            "faces",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        faceList(),
-        IOobject
-        (
-            "surfZones",
-            instance(),
-            meshSubDir,
-            *this,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        surfZoneList()
+        )
     ),
     MeshReference(this->storedIOFaces(), this->storedIOPoints())
 {
@@ -208,11 +164,62 @@ Foam::surfMesh::surfMesh
         Info<<"timeName: " << instance() << endl;
     }
 
-    // We can also send Xfer<..>::null just to initialize without allocating
-    if (notNull(surf))
+    copyContents(surf);
+}
+
+
+Foam::surfMesh::surfMesh
+(
+    const IOobject& io,
+    MeshedSurface<face>&& surf,
+    const word& surfName
+)
+:
+    surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
+    Allocator
+    (
+        IOobject
+        (
+            "points",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        IOobject
+        (
+            "faces",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        IOobject
+        (
+            "surfZones",
+            instance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        )
+    ),
+    MeshReference(this->storedIOFaces(), this->storedIOPoints())
+{
+    if (debug)
     {
-        transfer(surf());
+        Info<<"IOobject: " << io.path() << nl
+            <<" name: " << io.name()
+            <<" instance: " << io.instance()
+            <<" local: " << io.local()
+            <<" dbDir: " << io.db().dbDir() << endl;
+        Info<<"creating surfMesh at instance " << instance() << endl;
+        Info<<"timeName: " << instance() << endl;
     }
+
+    transfer(surf);
 }
 
 
@@ -258,39 +265,18 @@ void Foam::surfMesh::updateRefs()
 }
 
 
-void Foam::surfMesh::resetPrimitives
+void Foam::surfMesh::copyContents
 (
-    const Xfer<pointField>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<surfZoneList>& zones,
-    const bool validate
+    const MeshedSurface<face>& surf,
+    bool validate
 )
 {
-    // Clear addressing.
-    clearOut();
+    clearOut(); // Clear addressing
 
-    Allocator::reset(points, faces, zones);
-    this->updateRefs();
+    this->storedIOPoints() = surf.points();
+    this->storedIOFaces() = surf.surfFaces();
+    this->storedIOZones() = surf.surfZones();
 
-    if (validate)
-    {
-        checkZones();
-    }
-}
-
-
-void Foam::surfMesh::resetPrimitives
-(
-    const Xfer<List<point>>& points,
-    const Xfer<faceList>& faces,
-    const Xfer<surfZoneList>& zones,
-    const bool validate
-)
-{
-    // Clear addressing.
-    clearOut();
-
-    Allocator::reset(points, faces, zones);
     this->updateRefs();
 
     if (validate)
@@ -302,36 +288,40 @@ void Foam::surfMesh::resetPrimitives
 
 void Foam::surfMesh::transfer
 (
-    MeshedSurface<face>& surf
+    MeshedSurface<face>& surf,
+    bool validate
 )
 {
-    // Clear addressing.
-    clearOut();
+    clearOut(); // Clear addressing
 
     this->storedIOPoints().transfer(surf.storedPoints());
     this->storedIOFaces().transfer(surf.storedFaces());
     this->storedIOZones().transfer(surf.storedZones());
 
     this->updateRefs();
+
+    if (validate)
+    {
+        checkZones();
+    }
 }
 
 
-Foam::Xfer<Foam::MeshedSurface<Foam::face>>
-Foam::surfMesh::xfer()
+Foam::autoPtr<Foam::MeshedSurface<Foam::face>>
+Foam::surfMesh::releaseGeom()
 {
-    Xfer<MeshedSurface<face>> xf;
+    // Start with an empty geometry
+    auto aptr = autoPtr<MeshedSurface<face>>::New();
 
-    xf().storedPoints().transfer(this->storedPoints());
-    xf().storedFaces().transfer(this->storedFaces());
-    xf().storedZones().transfer(this->storedZones());
+    // Transfer in content
+    aptr->storedPoints().transfer(this->storedPoints());
+    aptr->storedFaces().transfer(this->storedFaces());
+    aptr->storedZones().transfer(this->storedZones());
 
-    // is this needed?
-    this->updateRefs();
+    this->updateRefs(); // This may not be needed...
+    clearOut(); // Clear addressing.
 
-    // Clear addressing.
-    clearOut();
-
-    return xf;
+    return aptr;
 }
 
 
@@ -386,31 +376,30 @@ void Foam::surfMesh::checkZones()
     if (zones.size() <= 1)
     {
         removeZones();
+        return;
     }
-    else
+
+    label count = 0;
+    for (surfZone& zn : zones)
     {
-        label count = 0;
-        forAll(zones, zoneI)
-        {
-            zones[zoneI].start() = count;
-            count += zones[zoneI].size();
-        }
+        zn.start() = count;
+        count += zn.size();
+    }
 
-        if (count < nFaces())
-        {
-            WarningInFunction
-                << "more faces " << nFaces() << " than zones " << count
-                << " ... extending final zone"
-                << endl;
+    if (count < nFaces())
+    {
+        WarningInFunction
+            << "More faces " << nFaces() << " than zones " << count
+            << " ... extending final zone"
+            << endl;
 
-            zones.last().size() += count - nFaces();
-        }
-        else if (count > size())
-        {
-            FatalErrorInFunction
-                << "more zones " << count << " than faces " << nFaces()
-                << exit(FatalError);
-        }
+        zones.last().size() += count - nFaces();
+    }
+    else if (size() < count)
+    {
+        FatalErrorInFunction
+            << "More zones " << count << " than faces " << nFaces()
+            << exit(FatalError);
     }
 }
 
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 5933d9450f..ee0cf48b5a 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD-2017 Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,6 +47,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declarations
 template<class Face> class MeshedSurface;
 
 /*---------------------------------------------------------------------------*\
@@ -59,10 +60,6 @@ class surfMesh
     private MeshedSurfaceIOAllocator,
     public  PrimitivePatch<face, ::Foam::UList, ::Foam::SubField<point>, point>
 {
-    // friends
-    template<class Face> friend class MeshedSurface;
-    template<class Face> friend class UnsortedMeshedSurface;
-
 public:
 
     // Public data types
@@ -81,7 +78,7 @@ public:
 
 private:
 
-    // Private typedefs
+    // Private Typedefs
 
         typedef MeshedSurfaceIOAllocator Allocator;
 
@@ -97,10 +94,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow construct as copy
+        //- Disallow copy construct
         surfMesh(const surfMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- Disallow copy assignment
         void operator=(const surfMesh&) = delete;
 
 
@@ -135,11 +132,15 @@ protected:
         //- Update references to storedPoints/storedFaces
         virtual void updateRefs();
 
+        //- Update with new contents
+        void copyContents(const MeshedSurface<face>& surf, bool validate=false);
+
 
 public:
 
     // Public typedefs
 
+    //- Typedef required for GeoMesh
     typedef surfMesh Mesh;
 
     //- Placeholder only, but do not remove - it is needed for GeoMesh
@@ -152,30 +153,32 @@ public:
     //- Return the mesh sub-directory name (normally "surfMesh")
     static word meshSubDir;
 
+
     // Constructors
 
-        //- Construct from IOobject, with alternative surface name
-        explicit surfMesh
-        (
-            const IOobject& io,
-            const word& surfName = word::null
-        );
+        //- Read construct from IOobject
+        explicit surfMesh(const IOobject& io);
 
-        //- Construct by transferring components (points, faces) without zones.
-        //  surfZones are added using addZones() member function
+        //- Read construct from IOobject, with alternative surface name
         surfMesh
         (
             const IOobject& io,
-            const Xfer<pointField>& pointLst,
-            const Xfer<faceList>& faceLst,
-            const word& surfName = word::null
+            const word& surfName
         );
 
-        //- Construct copy/move from MeshedSurface
+        //- Copy construct from MeshedSurface<face>
         surfMesh
         (
             const IOobject& io,
-            const Xfer<MeshedSurface<face>>& surf,
+            const MeshedSurface<face>& surf,
+            const word& surfName = word::null
+        );
+
+        //- Move construct from MeshedSurface<face>
+        surfMesh
+        (
+            const IOobject& io,
+            MeshedSurface<face>&& surf,
             const word& surfName = word::null
         );
 
@@ -186,118 +189,103 @@ public:
 
     // Member Functions
 
-      // Database
+    // Database
 
-            //- Return the local mesh directory (dbDir()/meshSubDir)
-            fileName meshDir() const;
+        //- Return the local mesh directory (dbDir()/meshSubDir)
+        fileName meshDir() const;
 
-            //- Return the current instance directory for points
-            //  Used in the construction of geometric mesh data dependent
-            //  on points
-            const fileName& pointsInstance() const;
+        //- Return the current instance directory for points
+        //  Used when constructing geometric mesh data dependent on points
+        const fileName& pointsInstance() const;
 
-            //- Return the current instance directory for faces
-            const fileName& facesInstance() const;
+        //- Return the current instance directory for faces
+        const fileName& facesInstance() const;
 
-            //- Set the instance for mesh files
-            void setInstance
-            (
-                const fileName&,
-                IOobject::writeOption = IOobject::AUTO_WRITE
-            );
+        //- Set the instance for mesh files
+        void setInstance
+        (
+            const fileName& inst,
+            IOobject::writeOption wOpt = IOobject::AUTO_WRITE
+        );
 
-            //- Adjust the write option for all components
-            void setWriteOption(IOobject::writeOption);
+        //- Adjust the write option for all components
+        void setWriteOption(IOobject::writeOption wOpt);
 
 
-      // Access
+    // Access
 
-            //- Return the number of raw points
-            virtual label nPoints() const;
+        //- Return the number of raw points
+        virtual label nPoints() const;
 
-            //- Return the number of raw faces
-            virtual label nFaces() const;
+        //- Return the number of raw faces
+        virtual label nFaces() const;
 
-            //- Return number of faces
-            virtual label size() const
-            {
-                return nFaces();
-            }
+        //- Return number of faces
+        virtual label size() const
+        {
+            return nFaces();
+        }
 
 
-            //- Return points
-            virtual const pointField& points() const;
+        //- Return points
+        virtual const pointField& points() const;
 
-            //- Return faces
-            virtual const faceList& faces() const;
+        //- Return faces
+        virtual const faceList& faces() const;
 
-            //- Return surface zones
-            virtual const surfZoneList& surfZones() const
-            {
-                return Allocator::storedIOZones();
-            }
-
-            //- Check the surface zone definitions
-            void checkZones();
+        //- Return surface zones
+        virtual const surfZoneList& surfZones() const
+        {
+            return Allocator::storedIOZones();
+        }
 
 
-            //- Return face area vectors (normals)
-            inline const vectorField& Sf() const
-            {
-                return MeshReference::faceAreas();
-            }
+        //- Return face area vectors (normals)
+        inline const vectorField& Sf() const
+        {
+            return MeshReference::faceAreas();
+        }
 
-            //- Return face area magnitudes
-            inline const scalarField& magSf() const
-            {
-                return MeshReference::magFaceAreas();
-            }
+        //- Return face area magnitudes
+        inline const scalarField& magSf() const
+        {
+            return MeshReference::magFaceAreas();
+        }
 
-            //- Face centres
-            inline const vectorField& Cf() const
-            {
-                return MeshReference::faceCentres();
-            }
-
-            //- Add surface zones
-            void addZones
-            (
-                const surfZoneList& srfZones,
-                const bool validate = true
-            );
-
-            //- Update the mesh based on the mesh files saved in
-            //  time directories
-            virtual readUpdateState readUpdate();
+        //- Face centres
+        inline const vectorField& Cf() const
+        {
+            return MeshReference::faceCentres();
+        }
 
 
-            //- Remove surface zones
-            void removeZones();
+    // Zones
 
-            //- Reset mesh primitive data.
-            void resetPrimitives
-            (
-                const Xfer<pointField>& points,
-                const Xfer<faceList>& faces,
-                const Xfer<surfZoneList>& zones,
-                const bool validate = true
-            );
+        //- Add surface zones, optionally validating the zone coverage
+        void addZones
+        (
+            const surfZoneList& srfZones,
+            bool validate = true
+        );
 
-            //- Reset mesh primitive data.
-            void resetPrimitives
-            (
-                const Xfer<List<point>>& points,
-                const Xfer<faceList>& faces,
-                const Xfer<surfZoneList>& zones,
-                const bool validate = true
-            );
+        //- Remove surface zones
+        void removeZones();
+
+        //- Check the surface zone definitions
+        void checkZones();
 
 
-            //- Transfer the contents of the argument and annul the argument
-            void transfer(MeshedSurface<face>& surf);
+    // Modification
+
+        //- Transfer the contents of the argument and annul the argument
+        //  Optionally validate the zone coverage.
+        void transfer(MeshedSurface<face>& surf, bool validate=false);
+
+        //- Update mesh based on the files saved in time directories
+        virtual readUpdateState readUpdate();
 
 
-      // Writing
+    // Writing
 
         //- Avoid masking the normal objectRegistry write
         using surfaceRegistry::write;
@@ -330,28 +318,28 @@ public:
         ) const;
 
 
-      // Storage management
+    // Storage management
 
-            //- Transfer contents to the Xfer container as a MeshedSurface
-            Xfer<MeshedSurface<face>> xfer();
+        //- Release the geometry and return as a MeshedSurface<face>.
+        autoPtr<MeshedSurface<face>> releaseGeom();
 
-            //- Clear geometry
-            void clearGeom();
+        //- Clear geometry
+        void clearGeom();
 
-            //- Clear addressing
-            void clearAddressing();
+        //- Clear addressing
+        void clearAddressing();
 
-            //- Clear all geometry and addressing unnecessary for CFD
-            void clearOut();
+        //- Clear all geometry and addressing unnecessary for CFD
+        void clearOut();
 
-            //- Clear primitive data (points, faces and cells)
-            void clearPrimitives();
+        //- Clear primitive data (points, faces and cells)
+        void clearPrimitives();
 
-            //- Remove all files from mesh instance
-            void removeFiles(const fileName& instanceDir) const;
+        //- Remove all files from mesh instance
+        void removeFiles(const fileName& instanceDir) const;
 
-            //- Remove all files from mesh instance()
-            void removeFiles() const;
+        //- Remove all files from mesh instance()
+        void removeFiles() const;
 
 };
 
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index 728c5820cc..d3a8a39e6d 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::surfMesh::setInstance(const fileName& inst, IOobject::writeOption w)
+void Foam::surfMesh::setInstance
+(
+    const fileName& inst,
+    IOobject::writeOption wOpt)
 {
     if (debug)
     {
@@ -38,14 +41,14 @@ void Foam::surfMesh::setInstance(const fileName& inst, IOobject::writeOption w)
     instance() = inst;
     Allocator::setInstance(inst);
 
-    setWriteOption(w);
+    setWriteOption(wOpt);
 }
 
 
-void Foam::surfMesh::setWriteOption(IOobject::writeOption w)
+void Foam::surfMesh::setWriteOption(IOobject::writeOption wOpt)
 {
-    writeOpt() = w;
-    Allocator::setWriteOption(w);
+    writeOpt() = wOpt;
+    Allocator::setWriteOption(wOpt);
 }
 
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 0f7d694745..26ec878226 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,7 +29,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(surfZoneIOList, 0);
+    defineTypeNameAndDebug(surfZoneIOList, 0);
 }
 
 
@@ -40,14 +40,9 @@ Foam::surfZoneIOList::surfZoneIOList
     const IOobject& io
 )
 :
-    surfZoneList(),
-    regIOobject(io)
+    regIOobject(io),
+    surfZoneList()
 {
-    Foam::string functionName =
-        "surfZoneIOList::surfZoneIOList"
-        "(const IOobject& io)";
-
-
     if
     (
         readOpt() == IOobject::MUST_READ
@@ -95,9 +90,7 @@ Foam::surfZoneIOList::surfZoneIOList
             facei += zoneSize;
         }
 
-        // Check state of IOstream
-        is.check(functionName.c_str());
-
+        is.check(FUNCTION_NAME);
         close();
     }
 }
@@ -106,51 +99,50 @@ Foam::surfZoneIOList::surfZoneIOList
 Foam::surfZoneIOList::surfZoneIOList
 (
     const IOobject& io,
-    const surfZoneList& zones
+    const UList<surfZone>& content
 )
 :
-    surfZoneList(zones),
-    regIOobject(io)
+    regIOobject(io),
+    surfZoneList(content)
 {}
 
 
 Foam::surfZoneIOList::surfZoneIOList
 (
     const IOobject& io,
-    const Xfer<surfZoneList>& zones
+    surfZoneList&& content
 )
 :
-    surfZoneList(zones),
-    regIOobject(io)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::surfZoneIOList::~surfZoneIOList()
+    regIOobject(io),
+    surfZoneList(std::move(content))
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-// writeData member function required by regIOobject
 bool Foam::surfZoneIOList::writeData(Ostream& os) const
 {
-    os  << *this;
-    return os.good();
+    return (os << *this).good();
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::surfZoneIOList::operator=(const surfZoneIOList& rhs)
+{
+    surfZoneList::operator=(rhs);
 }
 
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIOList& L)
+Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIOList& list)
 {
-    os  << L.size() << nl << token::BEGIN_LIST << incrIndent << nl;
+    os  << list.size() << nl << token::BEGIN_LIST << incrIndent << nl;
 
-    forAll(L, i)
+    for (const surfZone& item : list)
     {
-        L[i].writeDict(os);
+        item.writeDict(os);
     }
 
     os  << decrIndent << token::END_LIST;
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
index aab90ddf77..9a1894ecbe 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +45,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class surfZoneIOList;
 
@@ -58,18 +58,9 @@ Ostream& operator<<(Ostream&, const surfZoneIOList&);
 
 class surfZoneIOList
 :
-    public surfZoneList,
-    public regIOobject
+    public regIOobject,
+    public surfZoneList
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        surfZoneIOList(const surfZoneIOList&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const surfZoneIOList&);
-
-
 public:
 
     //- Runtime type information
@@ -79,28 +70,37 @@ public:
     // Constructors
 
         //- Construct from IOobject
-        explicit surfZoneIOList(const IOobject&);
+        explicit surfZoneIOList(const IOobject& io);
 
-        //- Construct from IOobject and surfZoneList
-        surfZoneIOList(const IOobject&, const surfZoneList&);
+        //- Construct from IOobject and surfZoneList content
+        surfZoneIOList(const IOobject& io, const UList<surfZone>& content);
 
-        //- Construct from IOobject and surfZoneList
-        surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
+        //- Construct from IOobject and transferring surfZoneList content
+        surfZoneIOList(const IOobject& io, surfZoneList&& content);
 
 
     //- Destructor
-    ~surfZoneIOList();
+    virtual ~surfZoneIOList() = default;
 
 
     // Member Functions
 
-        //- writeData member function required by regIOobject
-        bool writeData(Ostream&) const;
+        //- The writeData function for regIOobject
+        bool writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Copy assignment of entries
+        void operator=(const surfZoneIOList& rhs);
+
+        //- Copy or move assignment of entries
+        using surfZoneList::operator=;
 
 
     // IOstream Operators
 
-        friend Ostream& operator<<(Ostream&, const surfZoneIOList&);
+        friend Ostream& operator<<(Ostream& os, const surfZoneIOList& list);
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 6b9b6a0a08..0c548acf1f 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -399,7 +399,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         }
     }
 
-    this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
+    this->sortFacesAndStore(dynFaces, dynZones, sorted);
 
     // Add zones (retaining empty ones)
     this->addZones(dynSizes, names);
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 3a997ac669..0d8e42ba92 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -203,7 +203,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
     // Transfer to normal lists
     this->storedPoints().transfer(dynPoints);
 
-    this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
+    this->sortFacesAndStore(dynFaces, dynZones, sorted);
 
     // Add zones (retaining empty ones)
     this->addZones(dynSizes, dynNames);
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 48fbed1d43..55cc28e731 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -132,8 +132,10 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
         }
     }
 
-    // transfer to normal lists, no zone information
-    this->reset(pointLst.xfer(), dynFaces.xfer(), Xfer<surfZoneList>());
+    // Transfer to normal lists, no zone information
+    MeshedSurface<Face> surf(std::move(pointLst), std::move(dynFaces));
+
+    this->swap(surf);
 
     return true;
 }
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 7b6df0378f..0292458ee6 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -220,7 +220,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
     }
     mapPointId.clear();
 
-    this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
+    this->sortFacesAndStore(dynFaces, dynZones, sorted);
 
     // Add zones (retaining empty ones)
     this->addZones(dynSizes, dynNames);
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index 64ad423df8..e0809ea218 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -137,9 +137,9 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
     }
 
     // Retrieve the original zone information
-    List<word>  names(reader.names().xfer());
-    List<label> sizes(reader.sizes().xfer());
-    List<label> zoneIds(reader.zoneIds().xfer());
+    List<word>  names(std::move(reader.names()));
+    List<label> sizes(std::move(reader.sizes()));
+    List<label> zoneIds(std::move(reader.zoneIds()));
 
     // Generate the (sorted) faces
     List<Face> faceLst(zoneIds.size());
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 898adcb833..e2d080ccff 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -98,8 +98,8 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
     }
 
     // Retrieve the original zone information
-    List<label> sizes(reader.sizes().xfer());
-    List<label> zoneIds(reader.zoneIds().xfer());
+    List<label> sizes(std::move(reader.sizes()));
+    List<label> zoneIds(std::move(reader.zoneIds()));
 
     // Generate the (sorted) faces
     List<Face> faceLst(zoneIds.size());
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 54cf354ff7..e72fa673ca 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -200,6 +200,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
 
         DynamicList<Face> dynFaces(nTri);
         DynamicList<label> dynZones(nTri);
+
         forAll(faces, facei)
         {
             const face& f = faces[facei];
@@ -211,6 +212,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
                 dynZones.append(zones[facei]);
             }
         }
+        zones.clear();
 
         // Count
         labelList zoneSizes(nZones, 0);
@@ -219,7 +221,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
             zoneSizes[zonei]++;
         }
 
-        this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
+        this->sortFacesAndStore(dynFaces, dynZones, sorted);
 
         // Add zones (retaining empty ones)
         this->addZones(zoneSizes, zoneNames);
@@ -227,6 +229,8 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
     else
     {
         DynamicList<Face> dynFaces(faces.size());
+        DynamicList<label> dynZones(std::move(zones));
+
         for (const face& f : faces)
         {
             dynFaces.append(Face(f));
@@ -239,7 +243,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
             zoneSizes[zonei]++;
         }
 
-        this->sortFacesAndStore(dynFaces.xfer(), zones.xfer(), sorted);
+        this->sortFacesAndStore(dynFaces, dynZones, sorted);
 
         // Add zones (retaining empty ones)
         this->addZones(zoneSizes, zoneNames);
diff --git a/src/surfMesh/triSurface/patches/geometricSurfacePatch.H b/src/surfMesh/triSurface/patches/geometricSurfacePatch.H
index cd796d3d0c..c36b124e23 100644
--- a/src/surfMesh/triSurface/patches/geometricSurfacePatch.H
+++ b/src/surfMesh/triSurface/patches/geometricSurfacePatch.H
@@ -57,7 +57,7 @@ Ostream& operator<<(Ostream& os, const geometricSurfacePatch& p);
 
 class geometricSurfacePatch
 {
-    // Private data
+    // Private Data
 
         //- Type name of patch
         word geometricType_;
@@ -70,11 +70,21 @@ class geometricSurfacePatch
 
 public:
 
-    // Public data
+    // Public Data
 
         //- The name for an 'empty' type
         static const word emptyType;
 
+        //- Helper to convert identifier types as an operation
+        struct fromIdentifier
+        {
+            geometricSurfacePatch operator()(const surfZoneIdentifier& ident)
+            const
+            {
+                return geometricSurfacePatch(ident);
+            }
+        };
+
 
     //- Runtime type information
     ClassName("geometricSurfacePatch");
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index 3e86a1b459..581bc2ba3b 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 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.
@@ -409,7 +409,7 @@ void Foam::triSurface::setDefaultPatches()
 Foam::triSurface::triSurface()
 :
     ParentType(List<Face>(), pointField()),
-    patches_(0),
+    patches_(),
     sortedEdgeFacesPtr_(nullptr),
     edgeOwnerPtr_(nullptr)
 {}
@@ -428,9 +428,7 @@ Foam::triSurface::triSurface(triSurface&& surf)
 :
     triSurface()
 {
-    FaceListType::operator=(std::move(static_cast<FaceListType&>(surf)));
-    storedPoints() = std::move(surf.storedPoints());
-    patches_ = std::move(surf.patches());
+    transfer(surf);
 }
 
 
@@ -438,10 +436,10 @@ Foam::triSurface::triSurface
 (
     const List<labelledTri>& triangles,
     const geometricSurfacePatchList& patches,
-    const pointField& points
+    const pointField& pts
 )
 :
-    ParentType(triangles, points),
+    ParentType(triangles, pts),
     patches_(patches),
     sortedEdgeFacesPtr_(nullptr),
     edgeOwnerPtr_(nullptr)
@@ -452,25 +450,11 @@ Foam::triSurface::triSurface
 (
     List<labelledTri>& triangles,
     const geometricSurfacePatchList& patches,
-    pointField& points,
+    pointField& pts,
     const bool reuse
 )
 :
-    ParentType(triangles, points, reuse),
-    patches_(patches),
-    sortedEdgeFacesPtr_(nullptr),
-    edgeOwnerPtr_(nullptr)
-{}
-
-
-Foam::triSurface::triSurface
-(
-    const Xfer<List<labelledTri>>& triangles,
-    const geometricSurfacePatchList& patches,
-    const Xfer<List<point>>& points
-)
-:
-    ParentType(triangles, points),
+    ParentType(triangles, pts, reuse),
     patches_(patches),
     sortedEdgeFacesPtr_(nullptr),
     edgeOwnerPtr_(nullptr)
@@ -480,10 +464,10 @@ Foam::triSurface::triSurface
 Foam::triSurface::triSurface
 (
     const List<labelledTri>& triangles,
-    const pointField& points
+    const pointField& pts
 )
 :
-    ParentType(triangles, points),
+    ParentType(triangles, pts),
     patches_(),
     sortedEdgeFacesPtr_(nullptr),
     edgeOwnerPtr_(nullptr)
@@ -495,10 +479,10 @@ Foam::triSurface::triSurface
 Foam::triSurface::triSurface
 (
     const triFaceList& triangles,
-    const pointField& points
+    const pointField& pts
 )
 :
-    ParentType(convertToTri(triangles, 0), points),
+    ParentType(convertToTri(triangles, 0), pts),
     patches_(),
     sortedEdgeFacesPtr_(nullptr),
     edgeOwnerPtr_(nullptr)
@@ -589,28 +573,41 @@ const Foam::labelList& Foam::triSurface::edgeOwner() const
 }
 
 
-void Foam::triSurface::movePoints(const pointField& newPoints)
+void Foam::triSurface::movePoints(const pointField& pts)
 {
     // Remove all geometry dependent data
     deleteDemandDrivenData(sortedEdgeFacesPtr_);
 
-    // Adapt for new point position
-    ParentType::movePoints(newPoints);
+    // Adapt for new point positions
+    ParentType::movePoints(pts);
 
     // Copy new points
-    storedPoints() = newPoints;
+    storedPoints() = pts;
+}
+
+
+void Foam::triSurface::swapPoints(pointField& pts)
+{
+    // Remove all geometry dependent data
+    deleteDemandDrivenData(sortedEdgeFacesPtr_);
+
+    // Adapt for new point positions
+    ParentType::movePoints(pts);
+
+    // Move/swap new points
+    storedPoints().swap(pts);
 }
 
 
 void Foam::triSurface::scalePoints(const scalar scaleFactor)
 {
     // Avoid bad scaling
-    if (scaleFactor > VSMALL && scaleFactor != 1.0)
+    if (scaleFactor > SMALL && scaleFactor != 1.0)
     {
         // Remove all geometry dependent data
         clearTopology();
 
-        // Adapt for new point position
+        // Adapt for new point positions
         ParentType::movePoints(pointField());
 
         storedPoints() *= scaleFactor;
@@ -659,26 +656,6 @@ void Foam::triSurface::triFaceFaces(List<face>& plainFaces) const
 }
 
 
-Foam::Xfer<Foam::List<Foam::labelledTri>>
-Foam::triSurface::xferFaces()
-{
-    // Topology changed because of transfer
-    clearOut();
-
-    return this->storedFaces().xfer();
-}
-
-
-Foam::Xfer<Foam::List<Foam::point>>
-Foam::triSurface::xferPoints()
-{
-    // Topology changed because of transfer
-    clearOut();
-
-    return this->storedPoints().xfer();
-}
-
-
 // Finds area, starting at facei, delimited by borderEdge. Marks all visited
 // faces (from face-edge-face walk) with currentZone.
 void Foam::triSurface::markZone
@@ -867,38 +844,52 @@ Foam::triSurface Foam::triSurface::subsetMesh
         newTriangles[facei].region() = tri.region();
     }
 
-    // Construct subsurface
+    // Construct sub-surface
     return triSurface(newTriangles, patches(), newPoints, true);
 }
 
 
-void Foam::triSurface::reset
-(
-    const Xfer<List<labelledTri>>& triangles,
-    const geometricSurfacePatchList& patches,
-    const Xfer<List<point>>& points
-)
+void Foam::triSurface::swapFaces(List<labelledTri>& faceLst)
 {
-    clearOut();
+    clearOut();   // Topology changes
 
-    this->storedFaces().transfer(triangles());
-    this->storedPoints().transfer(points());
-
-    patches_ = patches;
+    this->storedFaces().swap(faceLst);
 }
 
 
-void Foam::triSurface::reset(MeshedSurface<labelledTri>& input)
+void Foam::triSurface::transfer(triSurface& surf)
 {
-    const auto& zones = input.surfZones();
+    clearOut();
 
-    geometricSurfacePatchList patches(zones.size());
-    forAll(zones, zonei)
-    {
-        patches[zonei] = geometricSurfacePatch(zones[zonei]);
-    }
+    FaceListType::transfer(surf.storedFaces());
+    storedPoints().transfer(surf.storedPoints());
+    patches_.transfer(surf.patches());
 
-    this->reset(input.xferFaces(), patches, input.xferPoints());
+    surf.clearOut();
+}
+
+
+void Foam::triSurface::transfer(MeshedSurface<labelledTri>& surf)
+{
+    // Transcribe zone -> patch info
+    auto patches = ListOps::create<geometricSurfacePatch>
+    (
+        surf.surfZones(),
+        geometricSurfacePatch::fromIdentifier()
+    );
+
+    // Fairly ugly, but the only way to get at the data safely
+    List<labelledTri> fcs;
+    pointField pts;
+
+    surf.swapFaces(fcs);
+    surf.swapPoints(pts);
+
+    clearOut();
+    surf.clear();
+
+    triSurface s(fcs, patches, pts, true);
+    swap(s);
 }
 
 
@@ -916,11 +907,13 @@ void Foam::triSurface::operator=(const triSurface& surf)
 
 void Foam::triSurface::operator=(triSurface&& surf)
 {
-    clearOut();
+    transfer(surf);
+}
 
-    FaceListType::operator=(std::move(static_cast<FaceListType&>(surf)));
-    storedPoints() = std::move(surf.storedPoints());
-    patches_ = std::move(surf.patches());
+
+void Foam::triSurface::operator=(MeshedSurface<labelledTri>&& surf)
+{
+    transfer(surf);
 }
 
 
diff --git a/src/surfMesh/triSurface/triSurface.H b/src/surfMesh/triSurface/triSurface.H
index 89b8e46e88..91077f8850 100644
--- a/src/surfMesh/triSurface/triSurface.H
+++ b/src/surfMesh/triSurface/triSurface.H
@@ -207,7 +207,7 @@ protected:
 
 public:
 
-    // Public typedefs
+    // Public Typedefs
 
         //- Placeholder only, but do not remove - it is needed for GeoMesh
         typedef bool BoundaryMesh;
@@ -253,7 +253,7 @@ public:
         (
             const List<labelledTri>& triangles,
             const geometricSurfacePatchList& patches,
-            const pointField& points
+            const pointField& pts
         );
 
         //- Construct from triangles, patches, points. Reuse storage.
@@ -261,31 +261,24 @@ public:
         (
             List<labelledTri>& triangles,
             const geometricSurfacePatchList& patches,
-            pointField& points,
+            pointField& pts,
             const bool reuse
         );
 
-        //- Construct by transferring (triangles, points) components.
-        triSurface
-        (
-            const Xfer<List<labelledTri>>& triangles,
-            const geometricSurfacePatchList& patches,
-            const Xfer<List<point>>& points
-        );
-
-        //- Construct from triangles, points. Set patch names to default.
+        //- Construct from triangles, points.
+        //- Set patch names to default.
         triSurface
         (
             const List<labelledTri>& triangles,
-            const pointField& points
+            const pointField& pts
         );
 
-        //- Construct from triangles, points Set region to 0 and default
-        //- patchName.
+        //- Construct from triangles, points.
+        //- Set region to 0 and default patchName.
         triSurface
         (
             const triFaceList& triangles,
-            const pointField& points
+            const pointField& pts
         );
 
         //- Construct from file name (uses extension to determine type).
@@ -314,7 +307,7 @@ public:
         void swap(triSurface& surf);
 
 
-      // Access
+    // Access
 
         const geometricSurfacePatchList& patches() const
         {
@@ -364,7 +357,7 @@ public:
         }
 
 
-      // Interoperability with other surface mesh classes
+    // Interoperability with other surface mesh classes
 
         //- Sort faces according to zoneIds
         //  Returns a surfZoneList and sets faceMap to index within faces()
@@ -375,10 +368,13 @@ public:
         void triFaceFaces(List<face>& plainFaceList) const;
 
 
-      // Edit
+    // Edit
 
         //- Move points
-        virtual void movePoints(const pointField& newPoints);
+        virtual void movePoints(const pointField& pts);
+
+        //- Swap points. Similar to movePoints, but returns the old points
+        virtual void swapPoints(pointField& pts);
 
         //- Scale points. A non-positive factor is ignored.
         virtual void scalePoints(const scalar scaleFactor);
@@ -433,27 +429,19 @@ public:
         ) const;
 
 
-        //- Transfer stored faces to an Xfer container
-        Xfer<List<labelledTri>> xferFaces();
-
-        //- Transfer stored points to an Xfer container
-        Xfer<List<point>> xferPoints();
+        //- Swap the list of faces being addressed
+        void swapFaces(List<labelledTri>& faceLst);
 
         //- Alter contents by transferring (triangles, points) components.
         //  Patch information is small and therefore just copied.
-        void reset
-        (
-            const Xfer<List<labelledTri>>& triangles,
-            const geometricSurfacePatchList& patches,
-            const Xfer<List<point>>& points
-        );
+        void transfer(triSurface& surf);
 
         //- Alter contents by transferring (triangles, points) components.
         //  Patch information is small and therefore just copied.
-        void reset(MeshedSurface<labelledTri>& input);
+        void transfer(MeshedSurface<labelledTri>& surf);
 
 
-      // Write
+    // Write
 
         //- Write to Ostream in simple FOAM format
         void write(Ostream& os) const;
@@ -476,6 +464,9 @@ public:
         //- Move assignment
         void operator=(triSurface&& surf);
 
+        //- Move assignment
+        void operator=(MeshedSurface<labelledTri>&& surf);
+
 
     // IOstream Operators
 
diff --git a/src/surfMesh/triSurface/triSurfaceIO.C b/src/surfMesh/triSurface/triSurfaceIO.C
index 3e4fdc2a00..c822da2d4d 100644
--- a/src/surfMesh/triSurface/triSurfaceIO.C
+++ b/src/surfMesh/triSurface/triSurfaceIO.C
@@ -171,7 +171,7 @@ bool Foam::triSurface::read
         using proxyType = UnsortedMeshedSurface<labelledTri>;
         if (proxyType::readTypes().found(ext))
         {
-            reset(proxyType::New(name, ext)());
+            transfer(*(proxyType::New(name, ext)));
             return true;
         }
     }
@@ -181,7 +181,7 @@ bool Foam::triSurface::read
         using proxyType = MeshedSurface<labelledTri>;
         if (proxyType::readTypes().found(ext))
         {
-            reset(proxyType::New(name, ext)());
+            transfer(*(proxyType::New(name, ext)));
             return true;
         }
     }