From b4703f4a08f42f0ff9b182f38d457be148c92226 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 4 Mar 2018 21:38:33 +0100
Subject: [PATCH 01/13] ENH: pre-cleanup of Xfer class (issue #639)

- This class is largely a pre-C++11 holdover, prior to having movable
  references.

- align internals with autoPtr instead of always unconditionally
  allocating memory. The valid() method can be used to check for a null
  pointer.

- Consolidate into a single file, in anticipation of future removal.
---
 applications/test/xfer1/Make/files   |   3 -
 applications/test/xfer1/Make/options |   0
 applications/test/xfer1/Test-xfer1.C | 233 ---------------------------
 src/OpenFOAM/memory/Xfer/Xfer.H      | 125 ++++++++------
 src/OpenFOAM/memory/Xfer/XferI.H     | 186 ---------------------
 5 files changed, 77 insertions(+), 470 deletions(-)
 delete mode 100644 applications/test/xfer1/Make/files
 delete mode 100644 applications/test/xfer1/Make/options
 delete mode 100644 applications/test/xfer1/Test-xfer1.C
 delete mode 100644 src/OpenFOAM/memory/Xfer/XferI.H

diff --git a/applications/test/xfer1/Make/files b/applications/test/xfer1/Make/files
deleted file mode 100644
index 10a272c027..0000000000
--- a/applications/test/xfer1/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-xfer1.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-xfer1
diff --git a/applications/test/xfer1/Make/options b/applications/test/xfer1/Make/options
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/applications/test/xfer1/Test-xfer1.C b/applications/test/xfer1/Test-xfer1.C
deleted file mode 100644
index f1fe7c0674..0000000000
--- a/applications/test/xfer1/Test-xfer1.C
+++ /dev/null
@@ -1,233 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "labelList.H"
-#include "DynamicList.H"
-#include "face.H"
-#include "pointField.H"
-#include "DynamicField.H"
-
-using namespace Foam;
-
-
-template<class Type>
-void printInfo(const Xfer<Type>& xf)
-{
-    Info<<"    address:" << long(xf.get()) << nl
-        <<"    isNull  = " << isNull(xf) << nl
-        <<"    notNull = " << notNull(xf) << nl
-        <<"    valid() = " << xf.valid() << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    labelList lstA(10);
-    labelList lstC
-    {
-        1, 2, 3, 4
-    };
-
-    forAll(lstA, i)
-    {
-        lstA[i] = 5 - i;
-    }
-
-    // Information about null-object
-
-    Info<<"nullObject:" << nl;
-    printInfo(Xfer<labelList>::null());
-    {
-        // This probably needs more work...
-        Xfer<labelList> xf = Xfer<labelList>::null();
-
-        Info<<"copy of nullObject:" << nl;
-        printInfo(xf);
-    }
-
-    Info<< "lstA: " << lstA << nl
-        << "lstC: " << lstC << nl;
-
-    Xfer<labelList> xA = xferMove(lstA);
-    Xfer<labelList> xB;
-
-    labelList lstB( xA );
-
-    Info<< "xA: " << xA() << nl
-        << "xB: " << xB() << nl
-        << "lstA: " << lstA << nl
-        << "lstB: " << lstB << nl
-        << "lstC: " << lstC << nl;
-
-    // Now illegal: xA = lstB;
-
-    xA->transfer(lstB);
-
-    Info<< "xA: " << xA() << nl
-        << "xB: " << xB() << nl
-        << "lstA: " << lstA << nl
-        << "lstB: " << lstB << nl
-        << "lstC: " << lstC << nl;
-
-    xB = xA;
-
-    // Construct with forwarding. For this example, truly ugly.
-    Xfer<labelList> xFwdA =
-        Xfer<labelList>::New
-        (
-            std::initializer_list<label>
-            {
-               1, 2, 10, 20, 15, 24, 200
-            }
-        );
-
-    Xfer<labelList> xFwdB = Xfer<labelList>::New(label(8), 123);
-    Xfer<labelList> xFwdC = Xfer<labelList>::New();
-
-    Info<< nl
-        << "Constructed with forwarding: " << nl
-        << *xFwdA << nl
-        << *xFwdB << nl
-        << *xFwdC << nl
-        << nl;
-
-
-    labelList lstD(xferCopy(lstC));
-    labelList lstE(xferMove(lstC));
-
-    // this must be empty
-    labelList lstF = xferCopy(lstC);
-
-    Info<< "xA: " << xA() << nl
-        << "xB: " << xB() << nl
-        << "lstA: " << lstA << nl
-        << "lstB: " << lstB << nl
-        << "lstC: " << lstC << nl
-        << "lstD: " << lstD << nl
-        << "lstE: " << lstE << nl
-        << "lstF: " << lstF << nl;
-
-    Info<< "xB[" << xB->size() << "]\n";
-
-    // clear the underlying List
-    xB->clear();
-
-    Info<< "xB[" << xB->size() << "]\n";
-
-    DynamicList<label> dl;
-    for (label i = 0; i < 5; ++i)
-    {
-        dl.append(i);
-    }
-
-    face f1(dl);
-    face f2(xferCopy<labelList>(dl));
-
-    Info<< "dl[" << dl.size() << "/" << dl.capacity() << "] " << dl << nl;
-    Info<< "f1: " << f1 << nl;
-    Info<< "f2: " << f2 << nl;
-
-    // add some more labels
-    for (label i = 5; i < 8; ++i)
-    {
-        dl.append(i);
-    }
-
-    // note: xfer() method returns a plain labelList
-    face f3(dl.xfer());
-    Info<< "dl[" << dl.size() << "/" << dl.capacity() << "] " << dl << nl;
-    Info<< "f3: " << f3 << nl;
-
-    Info<<"\nflip faces:" << nl;
-    f1.flip();
-    f3.flip();
-    Info<< "f1: " << f1 << nl;
-    Info<< "f3: " << f3 << nl;
-
-
-    {
-        Info<<"\nTest xfer with fields:" << nl;
-        List<point> list1
-        {
-            { 0, 1, 2 },
-            { 3, 4, 5 },
-            { 6, 7, 8 },
-            { 9, 10, 11 },
-        };
-
-        // Field from Xfer<List>
-        pointField field1(list1.xfer());
-        Info<<nl
-            << "xfer construct from List" << nl
-            <<"input (list) = " << list1 << nl
-            <<"output (field) = " << field1 << nl;
-
-
-        // Field from Xfer<List> ... again
-        pointField field2(field1.xfer());
-        Info<<nl
-            <<"xfer construct from Field (as List): " << nl
-            <<"input (field) = " << field1 << nl
-            <<"output (field) = " << field2 << nl;
-
-
-        // Field from Xfer<Field>
-        pointField field3(xferMove(field2));
-        Info<<nl
-            <<"xfer construct from Field (as Field): " << nl
-            <<"input (field) = " << field2 << nl
-            <<"output (field) = " << field3 << nl;
-
-
-        // Field from Xfer<Field> .. again
-        pointField field4(xferCopy(field3));
-        Info<<nl
-            <<"xfer copy construct from Field (as Field): " << nl
-            <<"input (field) = " << field3 << nl
-            <<"output (field) = " << field4 << nl;
-
-
-        DynamicField<point> dyfield1(xferCopy(field4));
-        Info<<nl
-            <<"xfer copy construct from Field (as Field): " << nl
-            <<"input (field) = " << field4 << nl
-            <<"output (dyn-field) = " << dyfield1 << nl;
-    }
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index 07371b19ab..b9519ccf6d 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -30,35 +30,24 @@ Description
     The wrapped object of type \<T\> must implement a transfer() method and
     an operator=() copy method.
 
-    Since it is decided upon construction of the Xfer object whether the
-    parameter is to be copied or transferred, the contents of the resulting
-    Xfer object can be transferred unconditionally. This greatly simplifies
-    defining constructors or methods in other classes with mixed
-    transfer/copy semantics without requiring 2^N different versions.
+\deprecated This class is an artifact from pre-C++11 code (MAR-2018).
 
-    When transferring between dissimilar types, the xferCopyTo() and
-    xferMoveTo() functions can prove useful. An example is transferring
-    from a DynamicList to a List.
-
-    \code
-        List<label> list1;
-        DynamicList<label> list2;
-        ...
-
-        SomeClass obj(xferCopy(list1), xferMoveTo<labelList>(list1));
-    \endcode
+Note
+    This class is an artifact from pre-C++11 code, where it was used
+    as a workaround for the lack of movable references (rvalue).
+    The interfaces previously using Xfer to reclaim memory now use
+    movable references directly or, in the rare case, an autoPtr.
 
 See also
     xferCopy, xferCopyTo, xferMove, xferMoveTo
 
-SourceFiles
-    XferI.H
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Xfer_H
 #define Xfer_H
 
+#include "nullObject.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -87,57 +76,81 @@ public:
 
     // Constructors
 
+        //- Construct with no managed object.
+        inline constexpr Xfer() noexcept : ptr_(nullptr)
+        {}
+
         //- Store object pointer and manage its deletion
         //  Can also be used later to transfer by assignment
-        inline explicit Xfer(T* p = nullptr);
+        inline explicit Xfer(T* p) noexcept : ptr_(p)
+        {}
 
-        //- Construct, transferring its contents
-        inline Xfer(const Xfer<T>& xf);
+        //- Move construct, transferring ownership
+        inline Xfer(const Xfer<T>& xf) noexcept : ptr_(xf.ptr_)
+        {
+            xf.ptr_ = nullptr;
+        }
 
 
     //- Destructor
-    inline ~Xfer();
+    inline ~Xfer() noexcept
+    {
+        delete ptr_;
+        ptr_ = nullptr;
+    }
 
 
     // Static Member Functions
 
         //- Return a null object reference
-        inline static const Xfer<T>& null();
-
-        //- Construct new Xfer container with forwarding arguments to T
-        template<class... Args>
-        inline static Xfer<T> New(Args&&... args);
+        inline static const Xfer<T>& null()
+        {
+            return NullObjectRef<Xfer<T>>();
+        }
 
 
     // Member Functions
 
-        //- Test for valid pointer and not a nullObject reference.
-        inline bool valid() const;
+        //- Test for valid pointer
+        inline bool valid() const noexcept { return ptr_; }
 
         //- Pointer to the underlying object.
-        inline T* get() const;
+        inline T* get() const noexcept { return ptr_; }
 
         //- Rvalue reference to the underlying object.
-        inline T&& rvalue() const;
+        inline T&& rvalue() const { return std::move(*ptr_); }
 
         //- Swaps the managed objects
-        inline void swap(Xfer<T>& other) noexcept;
+        inline void swap(Xfer<T>& other) noexcept
+        {
+            T* p = ptr_;
+            ptr_ = other.ptr_;
+            other.ptr_ = p;
+        }
 
 
     // Member Operators
 
-        //- Transfer contents into the object
-        inline void operator=(const Xfer<T>& xf);
-
         //- Reference to the underlying object
-        inline T& operator*() const;
+        inline T& operator*() const { return *ptr_; }
 
         //- Pointer to the underlying object
-        inline T* operator->() const;
+        inline T* operator->() const { return ptr_; }
 
         //- Reference to the underlying object
-        inline T& operator()() const;
+        inline T& operator()() const { return *ptr_; }
 
+        //- Move assignment, transferring ownership
+        inline void operator=(const Xfer<T>& rhs) noexcept
+        {
+            if (this != &rhs)
+            {
+                // clear and swap
+                delete ptr_;
+                ptr_ = rhs.ptr_;
+                rhs.ptr_ = nullptr;
+            }
+        }
 };
 
 
@@ -145,26 +158,41 @@ public:
 
 
 //- Copy construct contents of the \a obj
-//
+//  \deprecated - Xfer should not be used in new code
 //  \sa xferCopyTo, xferMove, xferMoveTo and Foam::Xfer
 template<class T>
-inline Xfer<T> xferCopy(const T& obj);
+inline Xfer<T> xferCopy(const T& obj)
+{
+    return Foam::Xfer<T>(new T(obj));
+}
+
 
 //- Transfer construct contents of the \a obj
+//  \deprecated - Xfer should not be used in new code
 //
 //  \sa xferCopy, xferCopyTo, xferMoveTo and Foam::Xfer
 template<class T>
-inline Xfer<T> xferMove(T& obj);
+inline Xfer<T> xferMove(T& obj)
+{
+    T* ptr = new T;
+    ptr->transfer(obj);
+    return Foam::Xfer<T>(ptr);
+}
 
 
 //- Copy construct contents of the \a obj from dissimilar type
+//  \deprecated - Xfer should not be used in new code
 //
 //  \sa xferCopy, xferMove, xferMoveTo and Foam::Xfer
 template<class T, class From>
-inline Xfer<T> xferCopyTo(const From& obj);
+inline Xfer<T> xferCopyTo(const From& obj)
+{
+    return Foam::Xfer<T>(new T(obj));
+}
 
 
 //- Transfer construct contents of the \a obj from dissimilar type
+//  \deprecated - Xfer should not be used in new code
 //
 //  \par Example Use
 //  \code
@@ -175,7 +203,12 @@ inline Xfer<T> xferCopyTo(const From& obj);
 //
 //  \sa xferCopy, xferCopyTo, xferMove and Foam::Xfer
 template<class T, class From>
-inline Xfer<T> xferMoveTo(From& obj);
+inline Xfer<T> xferMoveTo(From& obj)
+{
+    T* ptr = new T;
+    ptr->transfer(obj);
+    return Foam::Xfer<T>(ptr);
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -184,10 +217,6 @@ inline Xfer<T> xferMoveTo(From& obj);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "XferI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H
deleted file mode 100644
index f203ff074d..0000000000
--- a/src/OpenFOAM/memory/Xfer/XferI.H
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nullObject.H"
-#include <utility>
-
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
-template<class T>
-inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
-{
-    return NullObjectRef<Xfer<T>>();
-}
-
-
-template<class T>
-template<class... Args>
-inline Foam::Xfer<T> Foam::Xfer<T>::New(Args&&... args)
-{
-    return Xfer<T>(new T(std::forward<Args>(args)...));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class T>
-inline Foam::Xfer<T>::Xfer(T* p)
-:
-    ptr_(p ? p : new T)
-{}
-
-
-template<class T>
-inline Foam::Xfer<T>::Xfer(const Xfer<T>& xf)
-:
-    ptr_(new T)
-{
-    T* p = xf.get();
-
-    if (p && Foam::notNull(p))
-    {
-        ptr_->transfer(*p);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class T>
-inline bool Foam::Xfer<T>::valid() const
-{
-    return (ptr_ && Foam::notNull(ptr_));
-}
-
-
-template<class T>
-inline T* Foam::Xfer<T>::get() const
-{
-    return ptr_;
-}
-
-
-template<class T>
-inline T&& Foam::Xfer<T>::rvalue() const
-{
-    // Need check for valid() ?
-    return std::move(*ptr_);
-}
-
-
-template<class T>
-inline void Foam::Xfer<T>::swap(Xfer<T>& other) noexcept
-{
-    // Swap pointers
-    T* p = ptr_;
-    ptr_ = other.ptr;
-    other.ptr_ = p;
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class T>
-inline Foam::Xfer<T>::~Xfer()
-{
-    if (ptr_ && Foam::notNull(ptr_))
-    {
-        delete ptr_;
-    }
-    ptr_ = nullptr;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class T>
-inline void Foam::Xfer<T>::operator=(const Xfer<T>& xf)
-{
-    // Silently ignore attempted copy to self
-    if (this != &xf)
-    {
-        ptr_->transfer(*xf);
-    }
-}
-
-
-template<class T>
-inline T& Foam::Xfer<T>::operator*() const
-{
-    return *ptr_;
-}
-
-
-template<class T>
-inline T* Foam::Xfer<T>::operator->() const
-{
-    return ptr_;
-}
-
-
-template<class T>
-inline T& Foam::Xfer<T>::operator()() const
-{
-    return *ptr_;
-}
-
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-template<class T>
-inline Foam::Xfer<T> Foam::xferCopy(const T& obj)
-{
-    T* ptr = new T(obj);
-    return Foam::Xfer<T>(ptr);
-}
-
-
-template<class T, class From>
-inline Foam::Xfer<T> Foam::xferCopyTo(const From& obj)
-{
-    T* ptr = new T(obj);
-    return Foam::Xfer<T>(ptr);
-}
-
-
-template<class T>
-inline Foam::Xfer<T> Foam::xferMove(T& obj)
-{
-    T* ptr = new T;
-    ptr->transfer(obj);
-    return Foam::Xfer<T>(ptr);
-}
-
-
-template<class T, class From>
-inline Foam::Xfer<T> Foam::xferMoveTo(From& obj)
-{
-    T* ptr = new T;
-    ptr->transfer(obj);
-    return Foam::Xfer<T>(ptr);
-}
-
-
-// ************************************************************************* //

From 13ea73c31c3c5cc3daaad2a5dd19fd042b5b0565 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 2 Mar 2018 10:04:56 +0100
Subject: [PATCH 02/13] ENH: cleanup, extend zero/one classes

- constexpr, noexcept on various bits

- addition of a 'one::minus' class that returns '-1' instead of '1'.
  There are no additional operations defined for this class,
  but it can be used in various places to signal alternative behaviour
  such as "initialize to a negative or other invalid value"
---
 src/OpenFOAM/primitives/one/one.H    | 115 ++++++++++++++++++---------
 src/OpenFOAM/primitives/one/oneI.H   |  28 +++----
 src/OpenFOAM/primitives/zero/zero.H  |  90 ++++++++++-----------
 src/OpenFOAM/primitives/zero/zeroI.H |  32 ++++----
 4 files changed, 146 insertions(+), 119 deletions(-)

diff --git a/src/OpenFOAM/primitives/one/one.H b/src/OpenFOAM/primitives/one/one.H
index 350db36483..651029041e 100644
--- a/src/OpenFOAM/primitives/one/one.H
+++ b/src/OpenFOAM/primitives/one/one.H
@@ -25,8 +25,8 @@ Class
     Foam::one
 
 Description
-    A class representing the concept of 1 (or 1.0) used to avoid unnecessary
-    manipulations for objects that are known to be one at compile-time.
+    A class representing the concept of 1 (one), which can be used to avoid
+    manipulating objects that are known to be 'one' at compile-time.
 
 SourceFiles
     oneI.H
@@ -43,13 +43,13 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes, friend functions and operators
+// Forward declarations
+class one;
 class Istream;
 class Ostream;
-class one;
 
 /*---------------------------------------------------------------------------*\
-                           Class one Declaration
+                             Class one Declaration
 \*---------------------------------------------------------------------------*/
 
 class one
@@ -57,40 +57,73 @@ class one
 public:
     typedef one value_type;
 
-    // Forward declaration
+    // Forward declarations
+    class minus;
     class null;
 
+    //- Null constructible
+    constexpr one() noexcept {}
 
-    // Constructors
-
-        //- Null constructible
-        one()
-        {}
-
-        //- Construct null from Istream. Consumes no content.
-        explicit one(Istream&)
-        {}
+    //- Construct from Istream consumes no content.
+    explicit constexpr one(Istream&) noexcept {}
 
 
-    // Member operators
+    //- Return 1 for label
+    inline constexpr operator label() const noexcept
+    {
+        return 1;
+    }
 
-        //- Return 1 for label
-        inline operator label() const
-        {
-            return 1;
-        }
+    //- Return 1 for float
+    inline constexpr operator float() const noexcept
+    {
+        return 1;
+    }
 
-        //- Return 1 for float
-        inline operator float() const
-        {
-            return 1;
-        }
+    //- Return 1 for double
+    inline constexpr operator double() const noexcept
+    {
+        return 1;
+    }
+};
 
-        //- Return 1 for double
-        inline operator double() const
-        {
-            return 1;
-        }
+
+/*---------------------------------------------------------------------------*\
+                         Class one::minus Declaration
+\*---------------------------------------------------------------------------*/
+
+//- A class representing the concept of -1.
+//  Note that this class must never be derived from 'one', since this could
+//  potentially mask its behaviour.
+class one::minus
+{
+public:
+    typedef minus value_type;
+
+    //- Null constructible
+    constexpr minus() noexcept {}
+
+    //- Construct from Istream consumes no content.
+    explicit constexpr minus(Istream&) noexcept {}
+
+
+    //- Return -1 for label
+    inline constexpr operator label() const noexcept
+    {
+        return -1;
+    }
+
+    //- Return -1 for float
+    inline constexpr operator float() const noexcept
+    {
+        return -1;
+    }
+
+    //- Return -1 for double
+    inline constexpr operator double() const noexcept
+    {
+        return -1;
+    }
 };
 
 
@@ -107,25 +140,31 @@ public:
     typedef null value_type;
 
     //- Null constructible
-    null()
-    {}
+    constexpr null() noexcept {}
 
-    //- Construct null from Istream without consuming any content.
-    explicit null(Istream&)
-    {}
+    //- Construct from Istream consumes no content.
+    explicit constexpr null(Istream&) noexcept {}
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // IOstream Operators
 
 //- Read from Istream consumes no content.
-inline Istream& operator>>(Istream& is, one&)
+inline constexpr Istream& operator>>(Istream& is, one&) noexcept
+{
+    return is;
+}
+
+//- Read from Istream consumes no content.
+inline constexpr Istream& operator>>(Istream& is, one::minus&) noexcept
 {
     return is;
 }
 
 //- Write to Ostream emits no content.
-inline Ostream& operator<<(Ostream& os, const one::null&)
+inline constexpr Ostream& operator<<(Ostream& os, const one::null&) noexcept
 {
     return os;
 }
diff --git a/src/OpenFOAM/primitives/one/oneI.H b/src/OpenFOAM/primitives/one/oneI.H
index 05be7ad120..ffe911c66f 100644
--- a/src/OpenFOAM/primitives/one/oneI.H
+++ b/src/OpenFOAM/primitives/one/oneI.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.
@@ -23,7 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "one.H"
 #include "scalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,44 +40,45 @@ public:
     typedef arg2 type;
 };
 
-inline const one& operator*(const one& o, const one&)
+
+inline constexpr const one& operator*(const one& o, const one&) noexcept
 {
     return o;
 }
 
 template<class Type>
-inline const Type& operator*(const Type& t, const one&)
+inline constexpr const Type& operator*(const Type& val, const one&) noexcept
 {
-    return t;
+    return val;
 }
 
 template<class Type>
-inline const Type& operator*(const one&, const Type& t)
+inline constexpr const Type& operator*(const one&, const Type& val) noexcept
 {
-    return t;
+    return val;
 }
 
 template<class Type>
-inline const Type& operator&(const one&, const Type& t)
+inline constexpr const Type& operator&(const one&, const Type& val) noexcept
 {
-    return t;
+    return val;
 }
 
-inline const one& operator/(const one& o, const one&)
+inline constexpr const one& operator/(const one& o, const one&) noexcept
 {
     return o;
 }
 
 template<class Type>
-inline Type operator/(const one&, const Type& t)
+inline Type operator/(const one&, const Type& val)
 {
-    return scalar(1)/t;
+    return scalar(1)/val;
 }
 
 template<class Type>
-inline const Type& operator/(const Type& t, const one&)
+inline constexpr const Type& operator/(const Type& val, const one&) noexcept
 {
-    return t;
+    return val;
 }
 
 
diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/zero/zero.H
index 84cbf2c362..0cc989c825 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/zero/zero.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.
@@ -25,8 +25,8 @@ Class
     Foam::zero
 
 Description
-    A class representing the concept of 0 used to avoid unnecessary
-    manipulations for objects that are known to be zero at compile-time.
+    A class representing the concept of 0 (zero), which can be used to avoid
+    manipulating objects that are known to be 'zero' at compile-time.
 
 SourceFiles
     zeroI.H
@@ -44,13 +44,12 @@ namespace Foam
 {
 
 // Forward declarations
+class zero;
 class Istream;
 class Ostream;
 
-class zero;
-
 /*---------------------------------------------------------------------------*\
-                           Class zero Declaration
+                            Class zero Declaration
 \*---------------------------------------------------------------------------*/
 
 class zero
@@ -58,47 +57,39 @@ class zero
 public:
     typedef zero value_type;
 
-    // Forward declaration
+    // Forward declarations
     class null;
 
+    //- Null constructible
+    constexpr zero() noexcept {}
 
-    // Constructors
-
-        //- Null constructible
-        zero()
-        {}
-
-        //- Construct null from Istream. Consumes no content.
-        explicit zero(Istream&)
-        {}
+    //- Construct from Istream consumes no content.
+    explicit constexpr zero(Istream&) noexcept {}
 
 
-    // Member operators
+    //- Return false (0) for bool
+    inline constexpr operator bool() const noexcept
+    {
+        return false;
+    }
 
-        //- Return 0 for bool
-        inline operator bool() const
-        {
-            return 0;
-        }
+    //- Return 0 for label
+    inline constexpr operator label() const noexcept
+    {
+        return 0;
+    }
 
-        //- Return 0 for label
-        inline operator label() const
-        {
-            return 0;
-        }
-
-        //- Return 0 for float
-        inline operator float() const
-        {
-            return 0;
-        }
-
-        //- Return 0 for double
-        inline operator double() const
-        {
-            return 0;
-        }
+    //- Return 0 for float
+    inline constexpr operator float() const noexcept
+    {
+        return 0;
+    }
 
+    //- Return 0 for double
+    inline constexpr operator double() const noexcept
+    {
+        return 0;
+    }
 };
 
 
@@ -115,34 +106,33 @@ public:
     typedef null value_type;
 
     //- Null constructible
-    null()
-    {}
+    constexpr null() noexcept{}
 
-    //- Construct null from Istream without consuming any content.
-    explicit null(Istream&)
-    {}
+    //- Construct from Istream consumes no content.
+    explicit constexpr null(Istream&) noexcept {}
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Global zero
+static constexpr const zero Zero;
+
 // IOstream Operators
 
 //- Read from Istream consumes no content.
-inline Istream& operator>>(Istream& is, zero&)
+inline constexpr Istream& operator>>(Istream& is, zero&) noexcept
 {
     return is;
 }
 
 //- Write to Ostream emits no content.
-inline Ostream& operator<<(Ostream& os, const zero::null&)
+inline constexpr Ostream& operator<<(Ostream& os, const zero::null&) noexcept
 {
     return os;
 }
 
 
-// Global zero
-static const zero Zero;
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/zero/zeroI.H b/src/OpenFOAM/primitives/zero/zeroI.H
index d69255f159..01b80a5074 100644
--- a/src/OpenFOAM/primitives/zero/zeroI.H
+++ b/src/OpenFOAM/primitives/zero/zeroI.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.
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "zero.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -32,59 +30,59 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline zero operator+(const zero&, const zero&)
+inline constexpr zero operator+(const zero&, const zero&) noexcept
 {
     return Zero;
 }
 
 template<class Type>
-inline const Type& operator+(const Type& t, const zero&)
+inline constexpr const Type& operator+(const Type& val, const zero&) noexcept
 {
-    return t;
+    return val;
 }
 
 template<class Type>
-inline const Type& operator+(const zero&, const Type& t)
+inline constexpr const Type& operator+(const zero&, const Type& val) noexcept
 {
-    return t;
+    return val;
 }
 
-inline zero operator-(const zero&, const zero&)
+inline constexpr zero operator-(const zero&, const zero&) noexcept
 {
     return Zero;
 }
 
 template<class Type>
-inline const Type& operator-(const Type& t, const zero&)
+inline constexpr const Type& operator-(const Type& val, const zero&) noexcept
 {
-    return t;
+    return val;
 }
 
 template<class Type>
-inline Type operator-(const zero&, const Type& t)
+inline constexpr Type operator-(const zero&, const Type& val)
 {
-    return -t;
+    return -val;
 }
 
-inline zero operator*(const zero&, const zero&)
+inline constexpr zero operator*(const zero&, const zero&) noexcept
 {
     return Zero;
 }
 
 template<class Type>
-inline zero operator*(const Type& t, const zero&)
+inline constexpr zero operator*(const Type& val, const zero&) noexcept
 {
     return Zero;
 }
 
 template<class Type>
-inline zero operator*(const zero&, const Type& t)
+inline constexpr zero operator*(const zero&, const Type& val) noexcept
 {
     return Zero;
 }
 
 template<class Type>
-inline zero operator/(const zero&, const Type& t)
+inline constexpr zero operator/(const zero&, const Type& val) noexcept
 {
     return Zero;
 }

From 53ab527b45e06b30492936badab9f63f4fc32755 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 3 Mar 2018 20:32:49 +0100
Subject: [PATCH 03/13] ENH: added constexpr, noexcept for bool, Switch

- rationalized some method naming.
  Eg, c_str() instead of asText()
---
 .../controlMeshRefinement.C                   |   4 +-
 .../featurePointConformer.C                   |   8 +-
 .../initialPointsMethod/pointFile/pointFile.C |   2 +-
 .../extractionMethod/extractFromFile.C        |   2 +-
 .../extractionMethod/extractFromSurface.C     |   2 +-
 src/OpenFOAM/Make/files                       |   2 -
 src/OpenFOAM/primitives/bools/Switch/Switch.C |  87 +++++++++--
 src/OpenFOAM/primitives/bools/Switch/Switch.H | 136 +++++++++---------
 .../primitives/bools/Switch/SwitchIO.C        |  95 ------------
 src/OpenFOAM/primitives/bools/bool/bool.C     |  33 +++++
 src/OpenFOAM/primitives/bools/bool/bool.H     |   2 +-
 src/OpenFOAM/primitives/bools/bool/boolIO.C   |  63 --------
 .../primitives/bools/lists/boolList.C         |   7 -
 .../polyMeshFilter/polyMeshFilterSettings.C   |   2 +-
 14 files changed, 188 insertions(+), 257 deletions(-)
 delete mode 100644 src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
 delete mode 100644 src/OpenFOAM/primitives/bools/bool/boolIO.C

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
index 79e1531468..a3ca84da2c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
@@ -267,7 +267,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
 
         Info<< "Inserting points from " << controlFunction.name()
             << " (" << controlFunction.type() << ")" << endl;
-        Info<< "    Force insertion is " << forceInsertion.asText() << endl;
+        Info<< "    Force insertion is " << forceInsertion.c_str() << endl;
 
         pointField pts;
         scalarField sizes;
@@ -453,7 +453,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
 
         Info<< "Inserting points from " << controlFunction.name()
             << " (" << controlFunction.type() << ")" << endl;
-        Info<< "    Force insertion is " << forceInsertion.asText() << endl;
+        Info<< "    Force insertion is " << forceInsertion.c_str() << endl;
 
         DynamicList<Foam::point> extraPts;
         DynamicList<scalar> extraSizes;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 0e07acfebd..a546d0c834 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -538,13 +538,13 @@ Foam::featurePointConformer::featurePointConformer
 
     Info<< incrIndent
         << indent << "Circulating edges is: "
-        << foamyHexMeshControls_.circulateEdges().asText() << nl
+        << foamyHexMeshControls_.circulateEdges().c_str() << nl
         << indent << "Guarding feature points is: "
-        << foamyHexMeshControls_.guardFeaturePoints().asText() << nl
+        << foamyHexMeshControls_.guardFeaturePoints().c_str() << nl
         << indent << "Snapping to feature points is: "
-        << foamyHexMeshControls_.snapFeaturePoints().asText() << nl
+        << foamyHexMeshControls_.snapFeaturePoints().c_str() << nl
         << indent << "Specialising feature points is: "
-        << foamyHexMeshControls_.specialiseFeaturePoints().asText()
+        << foamyHexMeshControls_.specialiseFeaturePoints().c_str()
         << decrIndent
         << endl;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index a09153cf20..49728805b2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -66,7 +66,7 @@ pointFile::pointFile
         readScalar(detailsDict().lookup("randomPerturbationCoeff"))
     )
 {
-    Info<< "    Inside/Outside check is " << insideOutsideCheck_.asText()
+    Info<< "    Inside/Outside check is " << insideOutsideCheck_.c_str()
         << endl;
 }
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
index 7b2b0c8ad0..5dd577420f 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
@@ -84,7 +84,7 @@ Foam::surfaceFeaturesExtraction::extractFromFile::features
     Info<< nl << "Reading existing feature edges from file "
         << featureEdgeFile_ << nl
         << "Selecting edges based purely on geometric tests: "
-        << geometricTestOnly().asText() << endl;
+        << geometricTestOnly().c_str() << endl;
 
     return autoPtr<surfaceFeatures>
     (
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
index 35b5dc0e3f..f5a0354b62 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
@@ -78,7 +78,7 @@ Foam::surfaceFeaturesExtraction::extractFromSurface::features
     Info<< nl << "Constructing feature set from included angle "
         << includedAngle() << nl
         << "Selecting edges based purely on geometric tests: "
-        << geometricTestOnly().asText() << endl;
+        << geometricTestOnly().c_str() << endl;
 
     return autoPtr<surfaceFeatures>
     (
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 5d2dc3f178..ae8af888bf 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -19,9 +19,7 @@ $(fileOps)/collatedFileOperation/OFstreamCollator.C
 
 bools = primitives/bools
 $(bools)/bool/bool.C
-$(bools)/bool/boolIO.C
 $(bools)/Switch/Switch.C
-$(bools)/Switch/SwitchIO.C
 $(bools)/lists/boolList.C
 
 chars = primitives/chars
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index 9ddb0d95c1..e40b62f10b 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.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.
@@ -26,29 +26,29 @@ License
 #include "Switch.H"
 #include "error.H"
 #include "dictionary.H"
+#include "IOstreams.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
+const char* Foam::Switch::names[9] =
 {
     "false", "true",
     "no",    "yes",
     "off",   "on",
-    "none",  "true",  // Is there a reasonable counterpart to "none"?
+    "none",  "(unused)",
     "invalid"
 };
 
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
-Foam::Switch::switchType Foam::Switch::asEnum
+Foam::Switch::switchType Foam::Switch::parse
 (
     const std::string& str,
-    const bool allowInvalid
+    bool allowBad
 )
 {
-    const std::string::size_type len = str.size();
-    switch (len)
+    switch (str.size())
     {
         case 1: // (f|n|t|y) - single-character forms
         {
@@ -86,7 +86,7 @@ Foam::Switch::switchType Foam::Switch::asEnum
         }
     }
 
-    if (!allowInvalid)
+    if (!allowBad)
     {
         FatalErrorInFunction
             << "Unknown switch word " << str << nl
@@ -108,15 +108,29 @@ Foam::Switch Foam::Switch::lookupOrAddToDict
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::Switch::Switch(Istream& is)
+{
+    is >> *this;
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
 
-bool Foam::Switch::valid() const
+bool Foam::Switch::valid() const noexcept
 {
     return switch_ <= switchType::NONE;
 }
 
 
-const char* Foam::Switch::asText() const
+const char* Foam::Switch::c_str() const noexcept
+{
+    return names[switch_];
+}
+
+
+std::string Foam::Switch::str() const
 {
     return names[switch_];
 }
@@ -128,4 +142,57 @@ bool Foam::Switch::readIfPresent(const word& name, const dictionary& dict)
 }
 
 
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, Switch& sw)
+{
+    token t(is);
+
+    if (!t.good())
+    {
+        is.setBad();
+        return is;
+    }
+
+    if (t.isLabel())
+    {
+        sw = bool(t.labelToken());
+    }
+    else if (t.isWord())
+    {
+        // Allow reading invalid value, but report immediately
+        sw = Switch(t.wordToken(), true);
+
+        if (!sw.valid())
+        {
+            is.setBad();
+            FatalIOErrorInFunction(is)
+                << "expected 'true/false', 'on/off' ... found " << t.wordToken()
+                << exit(FatalIOError);
+
+            return is;
+        }
+    }
+    else
+    {
+        is.setBad();
+        FatalIOErrorInFunction(is)
+            << "wrong token type - expected bool, found " << t
+            << exit(FatalIOError);
+
+        return is;
+    }
+
+    is.check(FUNCTION_NAME);
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const Switch& sw)
+{
+    os << sw.c_str();
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index 256944b936..f2ef0d5439 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.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.
@@ -30,7 +30,6 @@ Description
 
 SourceFiles
     Switch.C
-    SwitchIO.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,19 +39,28 @@ SourceFiles
 #include "bool.H"
 #include "word.H"
 
+// Avoid any pre-processor conflicts with enum names
+#undef FALSE
+#undef TRUE
+#undef NO
+#undef YES
+#undef OFF
+#undef ON
+#undef NONE
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 class Switch;
 class dictionary;
 
-Istream& operator>>(Istream& is, Switch& s);
-Ostream& operator<<(Ostream& is, const Switch& s);
-
+// IOstream Operators
+Istream& operator>>(Istream& is, Switch& sw);
+Ostream& operator<<(Ostream& is, const Switch& sw);
 
 /*---------------------------------------------------------------------------*\
                            Class Switch Declaration
@@ -60,80 +68,63 @@ Ostream& operator<<(Ostream& is, const Switch& s);
 
 class Switch
 {
-    // Private data
-
-        //- The logic and enumerated text representation stored as a single byte
-        unsigned char switch_;
-
 public:
 
-    // Public data types
-
-        // Avoid issues with possible pre-processor defines
-        #undef FALSE
-        #undef TRUE
-        #undef NO
-        #undef YES
-        #undef OFF
-        #undef ON
-        #undef NONE
-        #undef PLACEHOLDER
-        #undef INVALID
-
-        //- The various text representations for a switch value.
-        //  These also correspond to the entries in names.
-        enum switchType
-        {
-            FALSE   = 0,  TRUE   = 1,
-            NO      = 2,  YES    = 3,
-            OFF     = 4,  ON     = 5,
-            NONE    = 6,  PLACEHOLDER = 7,
-            INVALID
-        };
-
-    // Static data members
-
-        //- The set of names corresponding to the switchType enumeration
-        //  Includes an extra entry for "invalid".
-        static const char* names[INVALID+1];
+    //- Switch enumerations corresponding to common text representations.
+    //  \note the values specified here are critical for its proper behaviour.
+    //  The lower bit is tested for the true/false condition.
+    //  The values correspond to an index into the predefined output names
+    //  for the c_str() method.
+    enum switchType
+    {
+        FALSE   = 0 /*!< "false" */, TRUE = 1 /*!< "true" */,
+        NO      = 2 /*!< "no" */,    YES  = 3 /*!< "yes" */,
+        OFF     = 4 /*!< "off" */,   ON   = 5 /*!< "on" */,
+        NONE    = 6 /*!< "none" */,
+        INVALID = 8 /*!< "invalid" */
+    };
 
 
 private:
 
+    // Private Data
+
+        //- The logic and enumerated text representation stored in a byte
+        unsigned char switch_;
+
+        //- The set of names corresponding to the switchType enumeration.
+        //  Includes extra entries for "invalid".
+        static const char* names[9];
+
     // Static Member Functions
 
-        //- Return a switchType representation of an input string
-        static switchType asEnum
-        (
-            const std::string& str,
-            const bool allowInvalid
-        );
-
+        //- Return enum value for input string
+        static switchType parse(const std::string& str, bool allowBad);
 
 public:
 
     // Constructors
 
-        //- Construct null as false
-        Switch()
+        //- Null constructible as false
+        constexpr Switch() noexcept
         :
             switch_(switchType::FALSE)
         {}
 
         //- Construct from enumerated value
-        Switch(const switchType sw)
+        constexpr Switch(const switchType sw) noexcept
         :
             switch_(sw)
         {}
 
         //- Construct from bool
-        Switch(const bool b)
+        constexpr Switch(const bool b) noexcept
         :
             switch_(b ? switchType::TRUE : switchType::FALSE)
         {}
 
         //- Construct from integer values (treats integer as bool value)
-        Switch(const int i)
+        constexpr Switch(const int i) noexcept
         :
             switch_(i ? switchType::TRUE : switchType::FALSE)
         {}
@@ -141,32 +132,35 @@ public:
         //- Construct from string - catches bad input.
         explicit Switch(const std::string& str)
         :
-            switch_(asEnum(str, false))
+            switch_(parse(str, false))
         {}
 
         //- Construct from character array - catches bad input.
         explicit Switch(const char* str)
         :
-            switch_(asEnum(std::string(str), false))
+            switch_(parse(str, false))
         {}
 
         //- Construct from string.
         //  Optionally allow bad words, and catch the error elsewhere
-        Switch(const std::string& str, const bool allowInvalid)
+        Switch(const std::string& str, const bool allowBad)
         :
-            switch_(asEnum(str, allowInvalid))
+            switch_(parse(str, allowBad))
         {}
 
         //- Construct from character array.
         //  Optionally allow bad words, and catch the error elsewhere
-        Switch(const char* str, const bool allowInvalid)
+        Switch(const char* str, const bool allowBad)
         :
-            switch_(asEnum(std::string(str), allowInvalid))
+            switch_(parse(str, allowBad))
         {}
 
         //- Construct from Istream
         Switch(Istream& is);
 
+
+    // Helpers
+
         //- Construct from dictionary, supplying default value so that if the
         //  value is not found, it is added into the dictionary.
         static Switch lookupOrAddToDict
@@ -180,10 +174,13 @@ public:
     // Member Functions
 
         //- Return true if the Switch has a valid value
-        bool valid() const;
+        bool valid() const noexcept;
 
-        //- Return a text representation of the Switch
-        const char* asText() const;
+        //- A string representation of the Switch value
+        const char* c_str() const noexcept;
+
+        //- A string representation of the Switch value
+        std::string str() const;
 
         //- Update the value of the Switch if it is found in the dictionary
         bool readIfPresent(const word& name, const dictionary& dict);
@@ -192,28 +189,29 @@ public:
     // Member Operators
 
         //- Conversion to bool
-        operator bool() const
+        operator bool() const noexcept
         {
             return (switch_ & 0x1);
         }
 
-        //- Assignment to enumerated value
-        void operator=(const switchType sw)
+        //- Assignment from enumerated value
+        void operator=(const switchType sw) noexcept
         {
             switch_ = sw;
         }
 
-        //- Assignment to bool
-        void operator=(const bool b)
+        //- Assignment from bool
+        void operator=(const bool b) noexcept
         {
             switch_ = (b ? Switch::TRUE : Switch::FALSE);
         }
 
 
-    // IOstream Operators
+    // Housekeeping
 
-        friend Istream& operator>>(Istream& is, Switch& s);
-        friend Ostream& operator<<(Ostream& os, const Switch& s);
+        //- A text representation of the Switch value
+        //  \deprecated - use c_str() instead (MAR-2018)
+        inline const char* asText() const { return c_str(); };
 };
 
 
diff --git a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
deleted file mode 100644
index b0bda84beb..0000000000
--- a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
+++ /dev/null
@@ -1,95 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Switch.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::Switch::Switch(Istream& is)
-{
-    is >> *this;
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
-{
-    token t(is);
-
-    if (!t.good())
-    {
-        is.setBad();
-        return is;
-    }
-
-    if (t.isLabel())
-    {
-        s = bool(t.labelToken());
-    }
-    else if (t.isWord())
-    {
-        // allow invalid values, but catch after for correct error message
-        Switch sw(t.wordToken(), true);
-
-        if (sw.valid())
-        {
-            s = sw;
-        }
-        else
-        {
-            is.setBad();
-            FatalIOErrorInFunction(is)
-                << "expected 'true/false', 'on/off' ... found " << t.wordToken()
-                << exit(FatalIOError);
-
-            return is;
-        }
-    }
-    else
-    {
-        is.setBad();
-        FatalIOErrorInFunction(is)
-            << "wrong token type - expected bool, found " << t
-            << exit(FatalIOError);
-
-        return is;
-    }
-
-    is.check(FUNCTION_NAME);
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const Switch& s)
-{
-    os << Switch::names[s.switch_];
-    os.check(FUNCTION_NAME);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.C b/src/OpenFOAM/primitives/bools/bool/bool.C
index 267a8c1611..7dc08dcbaa 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.C
+++ b/src/OpenFOAM/primitives/bools/bool/bool.C
@@ -24,6 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "bool.H"
+#include "Switch.H"
+#include "error.H"
+#include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,4 +47,34 @@ Foam::pTraits<bool>::pTraits(Istream& is)
     is >> p_;
 }
 
+
+Foam::Istream& Foam::operator>>(Istream& is, bool& b)
+{
+    if (is.good())
+    {
+        b = Switch(is);
+    }
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
+{
+    // Emit as label (not byte etc) for proper send/receive in parallel
+    os.write(label(b));
+    os.check(FUNCTION_NAME);
+    return os;
+}
+
+
+bool Foam::readBool(Istream& is)
+{
+    bool b;
+    is  >> b;
+
+    return b;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index b3cbe5567c..55ac2cfbff 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -28,7 +28,7 @@ Description
     System bool
 
 SourceFiles
-    boolIO.C
+    bool.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/primitives/bools/bool/boolIO.C b/src/OpenFOAM/primitives/bools/bool/boolIO.C
deleted file mode 100644
index 8f19c58bf3..0000000000
--- a/src/OpenFOAM/primitives/bools/bool/boolIO.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "bool.H"
-#include "Switch.H"
-#include "error.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::Istream& Foam::operator>>(Istream& is, bool& b)
-{
-    if (is.good())
-    {
-        b = Switch(is);
-    }
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
-{
-    // we could also write as text string without any difficulty
-    // os  << (b ? "true" : "false");
-    os.write(label(b));
-    os.check(FUNCTION_NAME);
-    return os;
-}
-
-
-bool Foam::readBool(Istream& is)
-{
-    bool b;
-    is  >> b;
-
-    return b;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/lists/boolList.C b/src/OpenFOAM/primitives/bools/lists/boolList.C
index 93332d7879..37fb536f85 100644
--- a/src/OpenFOAM/primitives/bools/lists/boolList.C
+++ b/src/OpenFOAM/primitives/bools/lists/boolList.C
@@ -21,9 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Specialisation of List\<T\> for bool.
-
 \*---------------------------------------------------------------------------*/
 
 #include "boolList.H"
@@ -34,13 +31,9 @@ Description
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 defineCompoundTypeName(List<bool>, boolList);
 addCompoundToRunTimeSelectionTable(List<bool>, boolList);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
index fd3076d26b..74082b280f 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
@@ -111,7 +111,7 @@ void Foam::polyMeshFilterSettings::writeSettings(Ostream& os) const
             << endl;
     }
 
-    os  << "Control mesh quality = " << controlMeshQuality().asText() << endl;
+    os  << "Control mesh quality = " << controlMeshQuality().c_str() << endl;
 
     if (controlMeshQuality())
     {

From 330b113abc8efc299ff53ac54c381097eb1b1e6a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 2 Mar 2018 13:17:54 +0100
Subject: [PATCH 04/13] BUG: incorrect cellId check in
 fvMatrix::setReferences()

---
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index e720726d25..bc407a0784 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -527,14 +527,14 @@ void Foam::fvMatrix<Type>::setReferences
     const bool forceReference
 )
 {
-    bool needRef = (forceReference || psi_.needReference());
+    const bool needRef = (forceReference || psi_.needReference());
 
     if (needRef)
     {
         forAll(cellLabels, celli)
         {
-            label cellId = cellLabels[celli];
-            if (celli >= 0)
+            const label cellId = cellLabels[celli];
+            if (cellId >= 0)
             {
                 source()[cellId] += diag()[cellId]*values[celli];
                 diag()[cellId] += diag()[cellId];

From ffd7b00ad5fce9da1e754ad13bcb3dfb657d8585 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 2 Mar 2018 13:27:34 +0100
Subject: [PATCH 05/13] ENH: fvMatrix::setReferences() single value variant

---
 .../pimpleFoam/overPimpleDyMFoam/correctPhi.H |  2 +-
 .../interFoam/overInterDyMFoam/correctPhi.H   |  2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 28 +++++++++++++++++--
 .../fvMatrices/fvMatrix/fvMatrix.H            | 10 ++++++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
index e5bbcadc67..1d8b670811 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@@ -101,7 +101,7 @@ if (mesh.changing())
             pcorrEqn.setReferences
             (
                 validCells,
-                scalarList(validCells.size(), 0.0),
+                scalar(0.0),
                 true
             );
         }
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
index 9c4608e238..cfd0353622 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@@ -110,7 +110,7 @@
             pcorrEqn.setReferences
             (
                 validCells,
-                scalarList(validCells.size(), 0.0),
+                scalar(0.0),
                 true
             );
         }
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index bc407a0784..c0c9b63da7 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -522,7 +522,32 @@ void Foam::fvMatrix<Type>::setReference
 template<class Type>
 void Foam::fvMatrix<Type>::setReferences
 (
-    const labelList& cellLabels,
+    const labelUList& cellLabels,
+    const Type& value,
+    const bool forceReference
+)
+{
+    const bool needRef = (forceReference || psi_.needReference());
+
+    if (needRef)
+    {
+        forAll(cellLabels, celli)
+        {
+            const label cellId = cellLabels[celli];
+            if (cellId >= 0)
+            {
+                source()[cellId] += diag()[cellId]*value;
+                diag()[cellId] += diag()[cellId];
+            }
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::fvMatrix<Type>::setReferences
+(
+    const labelUList& cellLabels,
     const UList<Type>& values,
     const bool forceReference
 )
@@ -544,7 +569,6 @@ void Foam::fvMatrix<Type>::setReferences
 }
 
 
-
 template<class Type>
 void Foam::fvMatrix<Type>::relax(const scalar alpha)
 {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 9bb0d91d2e..4cad056ab2 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -371,7 +371,15 @@ public:
             //- Set references level for solution
             void setReferences
             (
-                const labelList& cells,
+                const labelUList& cells,
+                const Type& value,
+                const bool forceReference = false
+            );
+
+            //- Set references level for solution
+            void setReferences
+            (
+                const labelUList& cells,
                 const UList<Type>& values,
                 const bool forceReference = false
             );

From 15f7260884b708aa813c427f9fafa69c6f7866ad Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 1 Mar 2018 14:12:51 +0100
Subject: [PATCH 06/13] ENH: cleanup of ListOps, ListListOps. Adjustments to
 List, PackedList.

- relocated ListAppendEqOp and ListUniqueEqOp to ListOps::appendEqOp
  and ListOps::UniqueEqOp, respectively for better code isolation and
  documentation of purpose.

- relocated setValues to ListOps::setValue() with many more
  alternative selectors possible

- relocated createWithValues to ListOps::createWithValue
  for better code isolation. The default initialization value is itself
  now a default parameter, which allow for less typing.

  Negative indices in the locations to set are now silently ignored,
  which makes it possible to use an oldToNew mapping that includes
  negative indices.

- additional ListOps::createWithValue taking a single position to set,
  available both in copy assign and move assign versions.
  Since a negative index is ignored, it is possible to combine with
  the output of List::find() etc.

STYLE: changes for PackedList

- code simplication in the PackedList iterators, including dropping
  the unused operator() on iterators, which is not available in plain
  list versions either.

- improved sizing for PackedBoolList creation from a labelUList.

ENH: additional List constructors, for handling single element list.

- can assist in reducing constructor ambiguity, but can also helps
  memory optimization when creating a single element list.
  For example,

    labelListList labels(one(), identity(mesh.nFaces()));
---
 applications/test/List/Test-List.C            | 188 ++++++++-
 .../test/PackedList1/Test-PackedList1.C       |   6 +-
 .../test/PackedList2/Test-PackedList2.C       |  10 +-
 .../test/PackedList4/Test-PackedList4.C       |  18 +-
 .../manipulation/checkMesh/checkGeometry.C    |   4 +-
 .../moveDynamicMesh/moveDynamicMesh.C         |   2 +-
 .../parLagrangianRedistributor.C              |   8 +-
 ...agrangianRedistributorRedistributeFields.C |   2 +-
 .../redistributePar/redistributePar.C         |   2 +-
 src/OpenFOAM/containers/Lists/List/List.C     |  86 ++--
 src/OpenFOAM/containers/Lists/List/List.H     |  50 +--
 src/OpenFOAM/containers/Lists/List/ListI.H    |   2 +-
 .../Lists/ListListOps/ListListOps.C           | 124 +++---
 .../Lists/ListListOps/ListListOps.H           |  43 +-
 .../containers/Lists/ListOps/ListOps.H        | 310 ++++++++++++--
 .../Lists/ListOps/ListOpsTemplates.C          | 382 ++++++++++++++----
 .../Lists/PackedList/PackedBoolListI.H        |   4 +-
 .../containers/Lists/PackedList/PackedList.H  |  35 +-
 .../containers/Lists/PackedList/PackedListI.H | 118 +++---
 src/OpenFOAM/containers/Lists/UList/UList.H   |   4 +-
 src/OpenFOAM/containers/Lists/UList/UListI.H  |   4 +-
 src/OpenFOAM/meshes/meshShapes/edge/edge.H    |   4 +-
 src/OpenFOAM/meshes/meshShapes/face/face.H    |   7 +-
 .../meshShapes/labelledTri/labelledTri.H      |   7 +-
 .../meshes/meshShapes/triFace/triFace.H       |  13 +-
 .../mapDistribute/mapDistributePolyMesh.C     |  32 +-
 .../snappyHexMeshDriver/snappyRefineDriver.C  |   6 +-
 .../AMIInterpolation/AMIInterpolation.C       |   6 +-
 .../distributedTriSurfaceMesh.C               |   8 +-
 src/sampling/surface/isoSurface/isoSurface.C  |   8 +-
 .../surface/isoSurface/isoSurfaceCell.C       |   8 +-
 31 files changed, 1017 insertions(+), 484 deletions(-)

diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index 1628b6f9ed..9ed62a26f9 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.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.
@@ -97,11 +97,14 @@ void printMyString(const UList<string>& lst)
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    argList::noFunctionObjects();
+
     argList::addOption("reList", "reList");
     argList::addOption("wordList", "wordList");
     argList::addOption("stringList", "stringList");
     argList::addOption("float", "xx");
-    argList::addBoolOption("transform", "Test List::createList functionality");
+    argList::addBoolOption("create", "Test ListOps::create functionality");
+    argList::addBoolOption("ListList", "Test list of list functionality");
     argList::addBoolOption("flag");
 
     #include "setRootCase.H"
@@ -332,11 +335,11 @@ int main(int argc, char *argv[])
         List<scalar> sident(range.begin(), range.end());
         Info<<"range-list (scalar)=" << sident << nl;
 
-        // Sub-ranges also work
-        List<scalar> sident2(range(3), range(10));
-        Info<<"range-list (scalar)=" << sident2 << nl;
+//        // Sub-ranges also work
+//        List<scalar> sident2(range.at(3), range.at(10));
+//        Info<<"subrange-list (scalar)=" << sident2 << nl;
 
-        // VERY BAD IDEA: List<scalar> sident3(range(10), range(3));
+        // VERY BAD IDEA: List<scalar> sident3(range.at(10), range.at(3));
 
         // This doesn't work, and don't know what it should do anyhow
         // List<vector> vident(range.begin(), range.end());
@@ -362,15 +365,15 @@ int main(int argc, char *argv[])
         Info<<"-flag:" << args["flag"] << endl;
     }
 
-    if (args.found("transform"))
+    if (args.found("create"))
     {
-        Info<< nl << "Test List::createList functionality" << nl;
+        Info<< nl << "Test ListOps::create functionality" << nl;
 
         const auto labels = identity(15);
         Info<< "labels: " << flatOutput(labels) << endl;
 
         {
-            auto scalars = List<scalar>::createList
+            auto scalars = ListOps::create<scalar>
             (
                 labels,
                 [](const label& val){ return scalar(1.5*val); }
@@ -379,7 +382,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            auto vectors = List<vector>::createList
+            auto vectors = ListOps::create<vector>
             (
                 labels,
                 [](const label& val){ return vector(1.2*val, -1.2*val, 0); }
@@ -388,7 +391,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            auto longs = List<long>::createList
+            auto longs = ListOps::create<long>
             (
                 labels,
                 [](const label& val){ return val; }
@@ -396,7 +399,7 @@ int main(int argc, char *argv[])
             Info<< "longs: " << flatOutput(longs) << endl;
         }
         {
-            auto negs = List<label>::createList
+            auto negs = ListOps::create<label>
             (
                 labels,
                 std::negate<label>()
@@ -405,7 +408,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            auto scalars = List<scalar>::createList
+            auto scalars = ListOps::create<scalar>
             (
                 labelRange::null.cbegin(),
                 labelRange::identity(15).cend(),
@@ -417,9 +420,9 @@ int main(int argc, char *argv[])
         #if WM_LABEL_SIZE == 32
         {
             List<int64_t> input(10);
-            std::iota(input.begin(), input.end(), 0);
+            std::iota(input.begin(), input.end(), 50);
 
-            auto output = List<label>::createList
+            auto output = ListOps::create<label>
             (
                 input,
                 toLabel<int64_t>()
@@ -429,9 +432,9 @@ int main(int argc, char *argv[])
         #elif WM_LABEL_SIZE == 64
         {
             List<int32_t> input(10);
-            std::iota(input.begin(), input.end(), 0);
+            std::iota(input.begin(), input.end(), 50);
 
-            auto output = List<label>::createList
+            auto output = ListOps::create<label>
             (
                 input,
                 toLabel<int32_t>()
@@ -439,6 +442,157 @@ int main(int argc, char *argv[])
             Info<< "label (from int32): " << flatOutput(output) << endl;
         }
         #endif
+
+
+        labelHashSet locations{ -15, 5, 10, 15, 25, 35 };
+        Info<< nl << "Test for createWithValue with locations :"
+            << flatOutput(locations.sortedToc()) << nl;
+
+        {
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                locations.toc(),  // Any order
+                100,
+                -1  // default value
+            );
+            Info<< "with labelUList: " << flatOutput(output)
+                << " selector: " << flatOutput(locations.sortedToc()) << nl;
+        }
+
+        {
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                locations,
+                100,
+                -1  // default value
+            );
+            Info<< "with labelHashSet: " << flatOutput(output)
+                << " selector: " << flatOutput(locations) << nl;
+        }
+
+        {
+            PackedBoolList select(locations.toc());
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                select,
+                100,
+                -1  // default value
+            );
+            Info<< "with PackedBoolList: " << flatOutput(output)
+                << " selector: " << flatOutput(select.used()) << nl;
+        }
+
+        {
+            // Fairly really inconvenient way to set true/false
+            labelList toc(locations.sortedToc());
+
+            List<bool> select = ListOps::createWithValue<bool>
+            (
+                toc.last() + 1,
+                toc,
+                true,
+                false  // default value
+            );
+
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                select,
+                100,
+                -1  // default value
+            );
+            Info<< "with boolList: " << flatOutput(output)
+                << " selector: " << flatOutput(select) << nl;
+        }
+
+        // Repeat with a shorter selector
+        locations = { -15, 5, 10 };
+
+        {
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                locations,
+                100,
+                -1  // default value
+            );
+            Info<< "with labelHashSet: " << flatOutput(output)
+                << " selector: " << flatOutput(locations) << nl;
+        }
+
+        {
+            PackedBoolList select(locations.toc());
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                select,
+                100,
+                -1  // default value
+            );
+            Info<< "with PackedBoolList: " << flatOutput(output)
+                << " selector: " << flatOutput(select.used()) << nl;
+        }
+
+        {
+            // Fairly really inconvenient way to set true/false
+            labelList toc(locations.sortedToc());
+
+            List<bool> select = ListOps::createWithValue<bool>
+            (
+                toc.last() + 1,
+                toc,
+                true,
+                false  // default value
+            );
+
+            auto output = ListOps::createWithValue<label>
+            (
+                30,
+                select,
+                100,
+                -1  // default value
+            );
+            Info<< "with boolList: " << flatOutput(output)
+                << " selector: " << flatOutput(select) << nl;
+        }
+    }
+
+    if (args.found("ListList"))
+    {
+        {
+            labelListList listlist(5, identity(5));
+            Info<<"list-list with length/val:" << listlist << nl;
+        }
+
+        {
+            labelListList listlist(one(), identity(5));
+            Info<<"list-list 1/val:" << listlist << nl;
+        }
+
+        {
+            labelList content = identity(5);
+
+            labelListList listlist(one(), content);
+            Info<<"list-list 1/copy val:" << listlist
+                <<" - from " << content << nl;
+        }
+
+        {
+            labelList content = identity(5);
+
+            labelListList listlist(one(), std::move(content));
+            Info<<"list-list 1/move val:" << listlist
+                <<" - from " << content << nl;
+        }
+
+        {
+            labelListList listlist(one(), Zero);
+            Info<<"list-list 1/move val:" << listlist
+                << nl;
+        }
     }
 
     if (args.readIfPresent<scalar>("float", xxx))
diff --git a/applications/test/PackedList1/Test-PackedList1.C b/applications/test/PackedList1/Test-PackedList1.C
index f39599fa6c..a963800e38 100644
--- a/applications/test/PackedList1/Test-PackedList1.C
+++ b/applications/test/PackedList1/Test-PackedList1.C
@@ -251,13 +251,13 @@ int main(int argc, char *argv[])
     Info<< "begin():";
     iter.printInfo(Info) << "\n";
 
-    Info<< "iterator:" << iter() << "\n";
-    iter() = 5;
+    Info<< "iterator:" << *iter << "\n";
+    *iter = 5;
     iter.printInfo(Info);
     list1.printInfo(Info, true);
 
     iter = list1[31];
-    Info<< "iterator:" << iter() << "\n";
+    Info<< "iterator:" << *iter << "\n";
     iter.printInfo(Info);
 
 
diff --git a/applications/test/PackedList2/Test-PackedList2.C b/applications/test/PackedList2/Test-PackedList2.C
index 51ddcdaec7..090b64d973 100644
--- a/applications/test/PackedList2/Test-PackedList2.C
+++ b/applications/test/PackedList2/Test-PackedList2.C
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        forAllIter(PackedBoolList, packed, it)
+        forAllIters(packed, it)
         {
             sum += it;
         }
@@ -244,9 +244,9 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        forAllConstIter(PackedBoolList, packed, cit)
+        forAllConstIters(packed, cit)
         {
-            sum += cit();
+            sum += *cit;
         }
     }
     std::cout
@@ -370,9 +370,9 @@ int main(int argc, char *argv[])
     // Write packed
     for (label iter = 0; iter < nIters; ++iter)
     {
-        forAllIter(PackedBoolList, packed, it)
+        forAllIters(packed, it)
         {
-            it() = 1;
+            *it = 1;
         }
     }
     Info<< "Writing packed using iterator:" << timer.cpuTimeIncrement()
diff --git a/applications/test/PackedList4/Test-PackedList4.C b/applications/test/PackedList4/Test-PackedList4.C
index cb94feb1b9..5d6dea3216 100644
--- a/applications/test/PackedList4/Test-PackedList4.C
+++ b/applications/test/PackedList4/Test-PackedList4.C
@@ -29,9 +29,12 @@ Description
 
 #include "uLabel.H"
 #include "boolList.H"
+#include "DynamicList.H"
 #include "IOstreams.H"
 #include "PackedBoolList.H"
+#include "ITstream.H"
 #include "StringStream.H"
+#include "FlatOutput.H"
 
 using namespace Foam;
 
@@ -135,8 +138,9 @@ int main(int argc, char *argv[])
 
     PackedBoolList list4
     (
-        IStringStream
+        ITstream
         (
+            "input",
             "(1 n 1 n 1 n 1 1 off 0 0 f f 0 y yes y true y false on t)"
         )()
     );
@@ -199,6 +203,18 @@ int main(int argc, char *argv[])
 
     list4.writeEntry("PackedBoolList", Info);
 
+    // Construct from labelUList, labelUIndList
+    {
+        DynamicList<label> indices({10, 50, 300});
+
+        Info<< "set: " << flatOutput(indices) << endl;
+
+        PackedBoolList bools1(indices);
+
+        Info<< "used: " << bools1.size() << " "
+            << flatOutput(bools1.used()) << endl;
+    }
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 12986a67c9..e34823f188 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -1007,7 +1007,7 @@ Foam::label Foam::checkGeometry
                         globalFaces().gather
                         (
                             UPstream::worldComm,
-                            labelList::createList
+                            ListOps::create<label>
                             (
                                 UPstream::procID(UPstream::worldComm),
                                 toLabel<int>()  // int -> label
@@ -1061,7 +1061,7 @@ Foam::label Foam::checkGeometry
                         globalFaces().gather
                         (
                             UPstream::worldComm,
-                            labelList::createList
+                            ListOps::create<label>
                             (
                                 UPstream::procID(UPstream::worldComm),
                                 toLabel<int>()  // int -> label
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index f9961f0242..eadf3831f9 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -84,7 +84,7 @@ void writeWeights
     globalFaces().gather
     (
         UPstream::worldComm,
-        labelList::createList
+        ListOps::create<label>
         (
             UPstream::procID(UPstream::worldComm),
             toLabel<int>()  // int -> label
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
index 9407439476..b55b14d9e3 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
@@ -81,7 +81,7 @@ void Foam::parLagrangianRedistributor::findClouds
     }
 
     // Synchronise cloud names
-    Pstream::combineGather(cloudNames, ListUniqueEqOp<word>());
+    Pstream::combineGather(cloudNames, ListOps::uniqueEqOp<word>());
     Pstream::combineScatter(cloudNames);
 
     objectNames.setSize(cloudNames.size());
@@ -117,10 +117,10 @@ void Foam::parLagrangianRedistributor::findClouds
     }
 
     // Synchronise objectNames
-    forAll(objectNames, cloudI)
+    forAll(objectNames, i)
     {
-        Pstream::combineGather(objectNames[cloudI], ListUniqueEqOp<word>());
-        Pstream::combineScatter(objectNames[cloudI]);
+        Pstream::combineGather(objectNames[i], ListOps::uniqueEqOp<word>());
+        Pstream::combineScatter(objectNames[i]);
     }
 }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
index 2e34a71a60..2506db2e60 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
@@ -44,7 +44,7 @@ Foam::wordList Foam::parLagrangianRedistributor::filterObjects
 
     // Parallel synchronise
     wordList fieldNames(objects.names(fieldClassName));
-    Pstream::combineGather(fieldNames, ListUniqueEqOp<word>());
+    Pstream::combineGather(fieldNames, ListOps::uniqueEqOp<word>());
     Pstream::combineScatter(fieldNames);
 
     if (!selectedFields.empty())
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index b082a260de..10c3ea80c5 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -2357,7 +2357,7 @@ int main(int argc, char *argv[])
     bool nfs = true;
     {
         List<fileName> roots(1, args.rootPath());
-        combineReduce(roots, ListUniqueEqOp<fileName>());
+        combineReduce(roots, ListOps::uniqueEqOp<fileName>());
         nfs = (roots.size() == 1);
     }
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index ea2c300524..d1660e0b4f 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -35,65 +35,6 @@ License
 
 #include <utility>
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-template<class T>
-template<class T2, class UnaryOperation>
-Foam::List<T> Foam::List<T>::createList
-(
-    const UList<T2>& input,
-    const UnaryOperation& op
-)
-{
-    const label len = input.size();
-
-    List<T> output(len);
-
-    if (len)
-    {
-        List_ACCESS(T, output, out);
-        List_CONST_ACCESS(T2, input, in);
-
-        for (label i = 0; i < len; ++i)
-        {
-            out[i] = op(in[i]);
-        }
-    }
-
-    return output;
-}
-
-
-template<class T>
-template<class InputIterator, class UnaryOperation>
-Foam::List<T> Foam::List<T>::createList
-(
-    InputIterator begIter,
-    InputIterator endIter,
-    const UnaryOperation& op
-)
-{
-    const label len = std::distance(begIter, endIter);
-
-    List<T> output(len);
-
-    if (len)
-    {
-        List_ACCESS(T, output, out);
-
-        InputIterator iter = begIter;
-
-        for (label i = 0; i < len; ++i)
-        {
-            out[i] = op(*iter);
-            ++iter;
-        }
-    }
-
-    return output;
-}
-
-
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T>
@@ -162,6 +103,33 @@ Foam::List<T>::List(const label len, const zero)
 }
 
 
+template<class T>
+Foam::List<T>::List(const one, const T& val)
+:
+    UList<T>(new T[1], 1)
+{
+    this->v_[0] = val;
+}
+
+
+template<class T>
+Foam::List<T>::List(const one, T&& val)
+:
+    UList<T>(new T[1], 1)
+{
+    this->v_[0] = std::move(val);
+}
+
+
+template<class T>
+Foam::List<T>::List(const one, const zero)
+:
+    UList<T>(new T[1], 1)
+{
+    this->v_[0] = Zero;
+}
+
+
 template<class T>
 Foam::List<T>::List(const UList<T>& a)
 :
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 73280d2492..d974d58e1c 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -42,6 +42,7 @@ SourceFiles
 
 #include "UList.H"
 #include "autoPtr.H"
+#include "one.H"
 #include "Xfer.H"
 #include "SLListFwd.H"
 
@@ -112,49 +113,11 @@ public:
         //- Return a null List
         inline static const List<T>& null();
 
-        //- Create from a list of a dissimilar type.
-        //  Eg, convert a list of ints to floats, vectors etc.
-        //  For example,
-        //  \code
-        //  auto vectors = List<vector>::createList
-        //  (
-        //      ints,
-        //      [](const int& val){ return vector(1.5*val, 0, 0); }
-        //  );
-        //
-        //  auto neg = labelList::createList
-        //  (
-        //      ints,
-        //      std::negate<label>()
-        //  );
-        //  auto labels = labelList::createList
-        //  (
-        //      ints,
-        //      toLabel<int>()
-        //  );
-        //  \endcode
-        template<class T2, class UnaryOperation>
-        static List<T> createList
-        (
-            const UList<T2>& input,
-            const UnaryOperation& op
-        );
-
-        //- Create from an iterator range (uses std::distance for the size).
-        //  The unary operation can be used to convert to other types.
-        template<class InputIterator, class UnaryOperation>
-        static List<T> createList
-        (
-            InputIterator begIter,
-            InputIterator endIter,
-            const UnaryOperation& op
-        );
-
 
     // Constructors
 
         //- Null constructor
-        inline List();
+        inline constexpr List() noexcept;
 
         //- Construct with given size
         explicit List(const label len);
@@ -165,6 +128,15 @@ public:
         //- Construct with given size initializing all elements to zero
         List(const label len, const zero);
 
+        //- Construct with length=1, copying the value as the only content
+        List(const one, const T& val);
+
+        //- Construct with length=1, moving the value as the only content
+        List(const one, T&& val);
+
+        //- Construct with length=1, initializing content to zero
+        List(const one, const zero);
+
         //- Copy construct from list
         List(const List<T>& a);
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index eb6eab8bd5..742500554d 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -88,7 +88,7 @@ inline Foam::List<T>::List
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::List<T>::List()
+inline constexpr Foam::List<T>::List() noexcept
 {}
 
 
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
index 55c5eb9ce4..fdfb42f3c8 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,93 +23,109 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
+template<class T, class AccessOp>
+Foam::labelList Foam::ListListOps::subSizes
+(
+    const UList<T>& lists,
+    AccessOp aop
+)
 {
+    labelList output(lists.size());
+    auto out = output.begin();
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class AccessType, class T, class AccessOp>
-AccessType ListListOps::combine(const List<T>& lst, AccessOp aop)
-{
-    label sum = 0;
-
-    forAll(lst, lstI)
+    for (const T& sub : lists)
     {
-        sum += aop(lst[lstI]).size();
+        *out = aop(sub).size();
+        ++out;
     }
 
-    AccessType result(sum);
-
-    label globalElemI = 0;
-
-    forAll(lst, lstI)
-    {
-        const T& sub = lst[lstI];
-
-        forAll(aop(sub), elemI)
-        {
-            result[globalElemI++] = aop(sub)[elemI];
-        }
-    }
-    return result;
+    return output;
 }
 
 
 template<class T, class AccessOp>
-labelList ListListOps::subSizes(const List<T>& lst, AccessOp aop)
+Foam::label Foam::ListListOps::sumSizes
+(
+    const UList<T>& lists,
+    AccessOp aop
+)
 {
-    labelList sizes(lst.size());
+    label len = 0;
 
-    forAll(lst, lstI)
+    for (const T& sub : lists)
     {
-        sizes[lstI] = aop(lst[lstI]).size();
+        len += aop(sub).size();
     }
-    return sizes;
+
+    return len;
+}
+
+
+template<class AccessType, class T, class AccessOp>
+AccessType Foam::ListListOps::combine
+(
+    const UList<T>& lists,
+    AccessOp aop
+)
+{
+    label len = 0;
+
+    for (const T& sub : lists)
+    {
+        len += aop(sub).size();
+    }
+
+    AccessType output(len);
+    auto out = output.begin();
+
+    for (const T& sub : lists)
+    {
+        for (const auto& item : aop(sub))
+        {
+            *out = item;
+            ++out;
+        }
+    }
+
+    return output;
 }
 
 
 template<class AccessType, class T, class AccessOp, class OffsetOp>
-AccessType ListListOps::combineOffset
+AccessType Foam::ListListOps::combineOffset
 (
-    const List<T>& lst,
-    const labelList& sizes,
+    const UList<T>& lists,
+    const labelUList& offsets,
     AccessOp aop,
     OffsetOp oop
 )
 {
-    label sum = 0;
+    label len = 0;
 
-    forAll(lst, lstI)
+    for (const T& sub : lists)
     {
-        sum += aop(lst[lstI]).size();
+        len += aop(sub).size();
     }
 
-    AccessType result(sum);
-
-    label globalElemI = 0;
+    AccessType output(len);
+    auto out = output.begin();
+    auto off = offsets.begin();
 
     label offset = 0;
-
-    forAll(lst, lstI)
+    for (const T& sub : lists)
     {
-        const T& sub = lst[lstI];
-
-        forAll(aop(sub), elemI)
+        for (const auto& item : aop(sub))
         {
-            result[globalElemI++] = oop(aop(sub)[elemI], offset);
+            *out = oop(item, offset);
+            ++out;
         }
 
-        offset += sizes[lstI];
+        offset += *off;
+        ++off;
     }
-    return result;
+
+    return output;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index ab9dfd4e49..4d5616621a 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.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.
@@ -93,12 +93,10 @@ SourceFiles
 namespace Foam
 {
 
-// Dummy access operator for ListListOps::combine()
+//- Dummy access operator for ListListOps::combine()
 template<class T>
-class accessOp
+struct accessOp
 {
-public:
-
     const T& operator()(const T& x) const
     {
         return x;
@@ -106,54 +104,57 @@ public:
 };
 
 
-// Offset operator for ListListOps::combineOffset()
+//- Offset operator for ListListOps::combineOffset()
 template<class T>
-class offsetOp
+struct offsetOp
 {
-public:
-
     T operator()(const T& x, const label offset) const
     {
         return x + offset;
     }
 };
 
+
 /*---------------------------------------------------------------------------*\
-                           Class ListListOps Declaration
+                       Namespace ListListOps Declaration
 \*---------------------------------------------------------------------------*/
 
 namespace ListListOps
 {
-
-    //- Combines sublists into one big list
-    template<class AccessType, class T, class AccessOp>
-    AccessType combine(const List<T>&, AccessOp aop = accessOp<T>());
-
-    //- Gets sizes of sublists
+    //- Return the sizes of the sub-lists
     template<class T, class AccessOp>
-    labelList subSizes(const List<T>&, AccessOp aop = accessOp<T>());
+    labelList subSizes(const UList<T>& lists, AccessOp aop = accessOp<T>());
+
+    //- The total size of all sub-lists
+    template<class T, class AccessOp>
+    label sumSizes(const UList<T>& lists, AccessOp aop = accessOp<T>());
+
+    //- Combines sub-lists into a single list
+    template<class AccessType, class T, class AccessOp>
+    AccessType combine(const UList<T>& lists, AccessOp aop = accessOp<T>());
 
     //- Like combine but also offsets sublists based on passed sizes
     template<class AccessType, class T, class AccessOp, class OffsetOp>
     AccessType combineOffset
     (
-        const List<T>&,
-        const labelList& sizes,
+        const UList<T>& lists,
+        const labelUList& offsets,
         AccessOp aop,
         OffsetOp oop = offsetOp<T>()
     );
-};
+
+} // End namespace ListListOps
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
     #include "ListListOps.C"
 #endif
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 4f65d10523..54033086d2 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -27,6 +27,12 @@ InNamspace
 Description
     Various functions to operate on Lists.
 
+Namespace
+    Foam::ListOps
+
+Description
+    Various utility functions to work on Lists.
+
 SourceFiles
     ListOps.C
     ListOpsTemplates.C
@@ -38,6 +44,8 @@ SourceFiles
 
 #include "FlatOutput.H"
 #include "labelList.H"
+#include "HashSet.H"
+#include "PackedBoolList.H"
 #include "ops.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -260,25 +268,6 @@ labelList findIndices
     label start=0
 );
 
-//- Opposite of findIndices: set values at indices to given value
-template<class ListType>
-void setValues
-(
-    ListType& input,
-    const labelUList& indices,
-    typename ListType::const_reference val
-);
-
-//- Opposite of findIndices: set values at indices to given value
-template<class ListType>
-ListType createWithValues
-(
-    const label len,
-    typename ListType::const_reference initValue,
-    const labelUList& indices,
-    typename ListType::const_reference setValue
-);
-
 //- Find index of max element (and larger than given element).
 //  return -1 if not found. Linear search.
 template<class ListType>
@@ -325,24 +314,6 @@ label findLower
 );
 
 
-//- Helper class for list to append y onto the end of x
-template<class T>
-class ListAppendEqOp
-{
-public:
-    void operator()(List<T>& x, const List<T>& y) const;
-};
-
-
-//- Helper class for list to append unique elements of y onto the end of x
-template<class T>
-class ListUniqueEqOp
-{
-public:
-    void operator()(List<T>& x, const List<T>& y) const;
-};
-
-
 //- Reverse a list. First element becomes last element etc.
 template<class ListType>
 ListType reverseList(const ListType& input);
@@ -364,6 +335,271 @@ template<template<typename> class ListType, class DataType>
 void inplaceRotateList(ListType<DataType>& list, label n);
 
 
+/*---------------------------------------------------------------------------*\
+                         Namespace ListOps Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace ListOps
+{
+
+//- List helper to append y elements onto the end of x
+template<class T>
+struct appendEqOp
+{
+    void operator()(List<T>& x, const List<T>& y) const;
+};
+
+//- List helper to append y unique elements onto the end of x
+template<class T>
+struct uniqueEqOp
+{
+    void operator()(List<T>& x, const List<T>& y) const;
+};
+
+
+//- Set various locations of the list with a specified value.
+//
+//  \param list the list to modify
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+template<class T>
+void setValue
+(
+    UList<T>& list,
+    const labelUList& locations,
+    const T& val
+);
+
+
+//- Set various locations of the list with a specified value.
+//
+//  \param list the list to modify
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+template<class T>
+void setValue
+(
+    UList<T>& list,
+    const labelHashSet& locations,
+    const T& val
+);
+
+
+//- Set various locations of the list with a specified value.
+//
+//  \param list the list to modify
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+template<class T>
+void setValue
+(
+    UList<T>& list,
+    const UList<bool>& locations,
+    const T& val
+);
+
+
+//- Set various locations of the list with a specified value.
+//
+//  \param list the list to modify
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+template<class T>
+void setValue
+(
+    UList<T>& list,
+    const PackedBoolList& locations,
+    const T& val
+);
+
+
+//- Create a List from a List of a dissimilar type, using the entire list.
+//  For example, convert a list of ints to floats, vectors etc.
+//
+//  \param input the list input values.
+//  \param op the unary conversion operator, which can be used to convert
+//      to other types.
+//
+//  \code
+//  auto neg = ListOps::create<label>
+//  (
+//      ints,
+//      std::negate<label>()
+//  );
+//
+//  auto labels = ListOps::create<label>
+//  (
+//      ints,
+//      toLabel<int>()
+//  );
+//
+//  auto vectors = ListOps::create<vector>
+//  (
+//      ints,
+//      [](const int& val){ return vector(1.5*val, 0, 0); }
+//  );
+//
+//  \endcode
+template<class T, class T2, class UnaryOperation>
+List<T> create
+(
+    const UList<T2>& input,
+    const UnaryOperation& op
+);
+
+
+//- Create a List from an iterator range [first,last) of a dissimilar type.
+//  Uses std::distance for the size.
+//
+//  \param first the begin of the iterator range
+//  \param last the end of the iterator range
+//  \param op the unary conversion operator, which can be used to convert
+//      to other types.
+template<class T, class InputIterator, class UnaryOperation>
+List<T> create
+(
+    InputIterator first,
+    InputIterator last,
+    const UnaryOperation& op
+);
+
+
+//- Create a List filled with default values and various locations with
+//- another specified value.
+//
+//  \param len the length of the list
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+//  \param deflt the initialization default value
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const labelUList& locations,
+    const T& val,
+    const T& deflt = T()
+);
+
+
+//- Create a List filled with default values and various locations with
+//- another specified value.
+//
+//  \param len the length of the list
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+//  \param deflt the initialization default value
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const labelHashSet& locations,
+    const T& val,
+    const T& deflt = T()
+);
+
+
+//- Create a List filled with default values and various locations with
+//- another specified value.
+//
+//  \param len the length of the list
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+//  \param deflt the initialization default value
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const UList<bool>& locations,
+    const T& val,
+    const T& deflt = T()
+);
+
+
+//- Create a List filled with default values and various locations with
+//- another specified value.
+//
+//  \param len the length of the list
+//  \param locations where to apply the specified value
+//       An out-of-range index is silently ignored.
+//  \param val the value to set at the specified locations
+//  \param deflt the initialization default value
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const PackedBoolList& locations,
+    const T& val,
+    const T& deflt = T()
+);
+
+
+//- Create a List filled with default values and one specified value,
+//- which is copy assigned at the specified index
+//
+//  \param len the length of the list
+//  \param index where to apply the specified value.
+//       An out-of-range index is silently ignored.
+//  \param val the value to copy assign at the specified index
+//  \param deflt the initialization default value
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const label index,
+    const T& val,
+    const T& deflt = T()
+);
+
+
+//- Create a List filled with default values and one specified value,
+//- which is move assigned at the specified index
+//
+//  \param len the length of the list
+//  \param index where to apply the specified value.
+//       An out-of-range index is silently ignored.
+//  \param val the value to move assign at the specified index
+//  \param deflt the initialization default value
+//
+//  For example,
+//  \code
+//  // Gather all unique points on master
+//
+//  List<pointField> gatheredPoints(Pstream::nProcs());
+//  gatheredPoints[Pstream::myProcNo()] = pointField
+//  (
+//      mesh.points(),
+//      uniqueMeshPoints
+//  );
+//  ...
+//
+//  // Or else
+//  auto gatheredPoints = ListOps::createWithValue<pointField>
+//  (
+//      Pstream::nProcs(),
+//      Pstream::myProcNo(),
+//      pointField(mesh.points(), uniqueMeshPoints)
+//  );
+//  ...
+//
+//  \endcode
+template<class T>
+List<T> createWithValue
+(
+    const label len,
+    const label index,
+    T&& val,
+    const T& deflt = T()
+);
+
+} // End namespace ListOps
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 0315a2465d..80702424a4 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -23,7 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include <utility>
 #include "ListOps.H"
+#include "ListLoopM.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -558,36 +560,6 @@ Foam::labelList Foam::findIndices
 }
 
 
-template<class ListType>
-void Foam::setValues
-(
-    ListType& input,
-    const labelUList& indices,
-    typename ListType::const_reference val
-)
-{
-    for (const label idx : indices)
-    {
-        input[idx] = val;
-    }
-}
-
-
-template<class ListType>
-ListType Foam::createWithValues
-(
-    const label len,
-    const typename ListType::const_reference initValue,
-    const labelUList& indices,
-    typename ListType::const_reference setValue
-)
-{
-    ListType list(len, initValue);
-    setValues(list, indices, setValue);
-    return list;
-}
-
-
 template<class ListType>
 Foam::label Foam::findMax(const ListType& input, const label start)
 {
@@ -736,51 +708,6 @@ Foam::label Foam::findLower
 }
 
 
-template<class T>
-void Foam::ListAppendEqOp<T>::operator()(List<T>& x, const List<T>& y) const
-{
-    if (y.size())
-    {
-        label len = x.size();
-        if (len)
-        {
-            x.setSize(len + y.size());
-            for (const T& val : y)
-            {
-                x[len++] = val;
-            }
-        }
-        else
-        {
-            x = y;
-        }
-    }
-}
-
-
-template<class T>
-void Foam::ListUniqueEqOp<T>::operator()(List<T>& x, const List<T>& y) const
-{
-    if (y.size())
-    {
-        if (x.size())
-        {
-            for (const T& val : y)
-            {
-                if (!x.found(val))
-                {
-                    x.append(val);
-                }
-            }
-        }
-        else
-        {
-            x = y;
-        }
-    }
-}
-
-
 template<class ListType>
 ListType Foam::reverseList(const ListType& input)
 {
@@ -859,4 +786,309 @@ void Foam::inplaceRotateList(ListType<DataType>& input, label n)
 }
 
 
+// * * * * * * * * * * * * * * * * * ListOps * * * * * * * * * * * * * * * * //
+
+template<class T>
+void Foam::ListOps::appendEqOp<T>::operator()
+(
+    List<T>& x,
+    const List<T>& y
+) const
+{
+    if (y.size())
+    {
+        label len = x.size();
+        if (len)
+        {
+            x.resize(len + y.size());
+            for (const T& val : y)
+            {
+                x[len++] = val;
+            }
+        }
+        else
+        {
+            x = y;
+        }
+    }
+}
+
+
+template<class T>
+void Foam::ListOps::uniqueEqOp<T>::operator()
+(
+    List<T>& x,
+    const List<T>& y
+) const
+{
+    if (y.size())
+    {
+        if (x.size())
+        {
+            for (const T& val : y)
+            {
+                if (!x.found(val))
+                {
+                    x.append(val);
+                }
+            }
+        }
+        else
+        {
+            x = y;
+        }
+    }
+}
+
+
+template<class T>
+void Foam::ListOps::setValue
+(
+    UList<T>& list,
+    const labelUList& locations,
+    const T& val
+)
+{
+    const label len = list.size();
+
+    for (const label index : locations)
+    {
+        // Range-checked
+        if (index >= 0 && index < len)
+        {
+            list[index] = val;
+        }
+    }
+}
+
+
+template<class T>
+void Foam::ListOps::setValue
+(
+    UList<T>& list,
+    const labelHashSet& locations,
+    const T& val
+)
+{
+    const label len = list.size();
+
+    for (const label index : locations)
+    {
+        // Range-checked
+        if (index >= 0 && index < len)
+        {
+            list[index] = val;
+        }
+    }
+}
+
+
+template<class T>
+void Foam::ListOps::setValue
+(
+    UList<T>& list,
+    const UList<bool>& locations,
+    const T& val
+)
+{
+    const label len = list.size();
+    const label count = locations.size();
+    const label end = min(count, len);
+
+    // The efficiency is modest
+    for (label index = 0; index < end; ++index)
+    {
+         if (locations[index])
+         {
+             list[index] = val;
+         }
+    }
+}
+
+
+template<class T>
+void Foam::ListOps::setValue
+(
+    UList<T>& list,
+    const PackedBoolList& locations,
+    const T& val
+)
+{
+    // Need improvements in PackedBoolList for more efficiency
+
+    const label len = list.size();
+    const label count = locations.count();
+
+    for (label index = 0, used = 0; index < len && used < count; ++index)
+    {
+        if (locations[index])
+        {
+            list[index] = val;
+            ++used;
+        }
+    }
+}
+
+
+template<class T, class T2, class UnaryOperation>
+Foam::List<T> Foam::ListOps::create
+(
+    const UList<T2>& input,
+    const UnaryOperation& op
+)
+{
+    const label len = input.size();
+
+    List<T> output(len);
+
+    if (len)
+    {
+        List_ACCESS(T, output, out);
+        List_CONST_ACCESS(T2, input, in);
+
+        for (label i = 0; i < len; ++i)
+        {
+            out[i] = op(in[i]);
+        }
+    }
+
+    return output;
+}
+
+
+template<class T, class InputIterator, class UnaryOperation>
+Foam::List<T> Foam::ListOps::create
+(
+    InputIterator first,
+    InputIterator last,
+    const UnaryOperation& op
+)
+{
+    const label len = std::distance(first, last);
+
+    List<T> output(len);
+
+    if (len)
+    {
+        List_ACCESS(T, output, out);
+
+        InputIterator in = first;
+
+        for (label i = 0; i < len; ++i)
+        {
+            out[i] = op(*in);
+            ++in;
+        }
+    }
+
+    return output;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const labelUList& locations,
+    const T& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+    ListOps::setValue(list, locations, val);
+
+    return list;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const labelHashSet& locations,
+    const T& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+    ListOps::setValue(list, locations, val);
+
+    return list;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const UList<bool>& locations,
+    const T& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+    ListOps::setValue(list, locations, val);
+
+    return list;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const PackedBoolList& locations,
+    const T& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+    ListOps::setValue(list, locations, val);
+
+    return list;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const label index,
+    const T& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+
+    // Range-checked
+    if (index >= 0 && index < len)
+    {
+        list[index] = val;
+    }
+
+    return list;
+}
+
+
+template<class T>
+Foam::List<T> Foam::ListOps::createWithValue
+(
+    const label len,
+    const label index,
+    T&& val,
+    const T& deflt
+)
+{
+    List<T> list(len, deflt);
+
+    // Range-checked
+    if (index >= 0 && index < len)
+    {
+        list[index] = std::move(val);
+    }
+
+    return list;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index c89acf0bc3..bd596dbf2b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -88,13 +88,13 @@ inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst)
 
 inline Foam::PackedBoolList::PackedBoolList(const labelUList& indices)
 :
-    PackedBoolList(indices.size(), indices)
+    PackedBoolList((indices.size() ? indices.last() : 0), indices)
 {}
 
 
 inline Foam::PackedBoolList::PackedBoolList(const labelUIndList& indices)
 :
-    PackedBoolList(indices.size(), indices)
+    PackedBoolList((indices.size() ? indices.last() : 0), indices)
 {}
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 8ffd02e704..56167ad0c8 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -384,7 +384,7 @@ public:
         void writeEntry(const word& keyword, Ostream& os) const;
 
 
-      // Member operators
+      // Member Operators
 
         //- Append a value at the end of the list
         inline PackedList<nBits>& append(const unsigned int val);
@@ -438,22 +438,32 @@ public:
                 label index_;
 
 
+            // Constructors
+
+                //- Construct null - an end iterator
+                inline iteratorBase();
+
+                //- Construct from base list and position index
+                inline iteratorBase(const PackedList* lst, const label i);
+
+
             // Protected Member Functions
 
+                //- Limit index to the list size - avoid going past end()
+                //  Eg, iter = iterator(list, Inf)
+                inline void bound();
+
                 //- Get value as unsigned, no range-checking
                 inline unsigned int get() const;
 
                 //- Set value, returning true if changed, no range-checking
                 inline bool set(unsigned int val);
 
+                //- Move backward through list
+                inline void prev();
 
-            // Constructors
-
-                //- Construct null
-                inline iteratorBase();
-
-                //- Construct from base list and position index
-                inline iteratorBase(const PackedList* lst, const label i);
+                //- Move forward through list
+                inline void next();
 
 
         public:
@@ -534,15 +544,9 @@ public:
                 //- Return value
                 inline unsigned int operator*() const;
 
-                //- Return value
-                inline unsigned int operator()() const;
-
                 //- Return iteratorBase for assigning values
                 inline iteratorBase& operator*();
 
-                //- Return iteratorBase for assigning values
-                inline iteratorBase& operator()();
-
                 inline iterator& operator++();
                 inline iterator operator++(int);
 
@@ -595,9 +599,6 @@ public:
                 //- Return referenced value directly
                 inline unsigned int operator*() const;
 
-                //- Return referenced value directly
-                inline unsigned int operator()() const;
-
                 inline const_iterator& operator++();
                 inline const_iterator operator++(int);
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index b4efd00711..9696290f92 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -294,8 +294,31 @@ inline Foam::PackedList<nBits>::iteratorBase::iteratorBase
 
 
 template<unsigned nBits>
-inline unsigned int
-Foam::PackedList<nBits>::iteratorBase::get() const
+inline void Foam::PackedList<nBits>::iteratorBase::bound()
+{
+    if (list_ && index_ > list_->size_)
+    {
+        index_ = list_->size_;
+    }
+}
+
+
+template<unsigned nBits>
+inline void Foam::PackedList<nBits>::iteratorBase::prev()
+{
+    --index_;
+}
+
+
+template<unsigned nBits>
+inline void Foam::PackedList<nBits>::iteratorBase::next()
+{
+    ++index_;
+}
+
+
+template<unsigned nBits>
+inline unsigned int Foam::PackedList<nBits>::iteratorBase::get() const
 {
     const unsigned int seg = index_ / packing();
     const unsigned int off = index_ % packing();
@@ -306,8 +329,7 @@ Foam::PackedList<nBits>::iteratorBase::get() const
 
 
 template<unsigned nBits>
-inline bool
-Foam::PackedList<nBits>::iteratorBase::set(const unsigned int val)
+inline bool Foam::PackedList<nBits>::iteratorBase::set(const unsigned int val)
 {
     const unsigned int seg = index_ / packing();
     const unsigned int off = index_ % packing();
@@ -346,7 +368,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator==
     const iteratorBase& iter
 ) const
 {
-    return this->get() == iter.get();
+    return this->get() == iter.get(); // Compare values
 }
 
 
@@ -356,7 +378,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator!=
     const iteratorBase& iter
 ) const
 {
-    return this->get() != iter.get();
+    return this->get() != iter.get(); // Compare values
 }
 
 
@@ -366,8 +388,7 @@ inline void Foam::PackedList<nBits>::iteratorBase::operator=
     const iteratorBase& iter
 )
 {
-    const unsigned int val = iter.get();
-    this->set(val);
+    this->set(iter.get()); // Set values
 }
 
 
@@ -423,12 +444,7 @@ inline Foam::PackedList<nBits>::iterator::iterator
 :
     iteratorBase(iter)
 {
-    // Avoid going past end()
-    // eg, iter = iterator(list, Inf)
-    if (this->index_ > this->list_->size_)
-    {
-        this->index_ = this->list_->size_;
-    }
+    this->bound();
 }
 
 
@@ -440,12 +456,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 :
     iteratorBase(iter)
 {
-    // Avoid going past end()
-    // eg, iter = iterator(list, Inf)
-    if (this->index_ > this->list_->size_)
-    {
-        this->index_ = this->list_->size_;
-    }
+    this->bound();
 }
 
 
@@ -487,7 +498,7 @@ inline bool Foam::PackedList<nBits>::iterator::operator==
     const iteratorBase& iter
 ) const
 {
-    return this->index_ == iter.index_;
+    return this->index_ == iter.index_; // Compare positions
 }
 
 
@@ -497,7 +508,7 @@ inline bool Foam::PackedList<nBits>::iterator::operator!=
     const iteratorBase& iter
 ) const
 {
-    return this->index_ != iter.index_;
+    return this->index_ != iter.index_; // Compare positions
 }
 
 
@@ -507,7 +518,7 @@ inline bool Foam::PackedList<nBits>::const_iterator::operator==
     const iteratorBase& iter
 ) const
 {
-    return this->index_ == iter.index_;
+    return this->index_ == iter.index_; // Compare positions
 }
 
 
@@ -517,7 +528,7 @@ inline bool Foam::PackedList<nBits>::const_iterator::operator!=
     const iteratorBase& iter
 ) const
 {
-    return this->index_ != iter.index_;
+    return this->index_ != iter.index_; // Compare positions
 }
 
 
@@ -530,12 +541,7 @@ inline void Foam::PackedList<nBits>::iterator::operator=
     this->list_  = iter.list_;
     this->index_ = iter.index_;
 
-    // Avoid going past end()
-    // eg, iter = iterator(list, Inf)
-    if (this->index_ > this->list_->size_)
-    {
-        this->index_ = this->list_->size_;
-    }
+    this->bound();
 }
 
 
@@ -548,14 +554,7 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
     this->list_  = iter.list_;
     this->index_ = iter.index_;
 
-    // Avoid going past end()
-    // eg, iter = iterator(list, Inf)
-    if (this->index_ > this->list_->size_)
-    {
-        this->index_ = this->list_->size_;
-    }
-
-    return *this;
+    this->bound();
 }
 
 
@@ -563,7 +562,7 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator++()
 {
-    ++this->index_;
+    this->next();
     return *this;
 }
 
@@ -572,7 +571,7 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator&
 Foam::PackedList<nBits>::const_iterator::operator++()
 {
-    ++this->index_;
+    this->next();
     return *this;
 }
 
@@ -581,8 +580,8 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::iterator::operator++(int)
 {
-    iterator old = *this;
-    ++this->index_;
+    iterator old(*this);
+    this->next();
     return old;
 }
 
@@ -591,8 +590,8 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::const_iterator::operator++(int)
 {
-    const_iterator old = *this;
-    ++this->index_;
+    const_iterator old(*this);
+    this->next();
     return old;
 }
 
@@ -601,7 +600,7 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator--()
 {
-    --this->index_;
+    this->prev();
     return *this;
 }
 
@@ -610,7 +609,7 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator&
 Foam::PackedList<nBits>::const_iterator::operator--()
 {
-    --this->index_;
+    this->prev();
     return *this;
 }
 
@@ -619,8 +618,8 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::iterator::operator--(int)
 {
-    iterator old = *this;
-    --this->index_;
+    iterator old(*this);
+    this->prev();
     return old;
 }
 
@@ -629,8 +628,8 @@ template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::const_iterator::operator--(int)
 {
-    const_iterator old = *this;
-    --this->index_;
+    const_iterator old(*this);
+    this->prev();
     return old;
 }
 
@@ -643,14 +642,6 @@ Foam::PackedList<nBits>::iterator::operator*()
 }
 
 
-template<unsigned nBits>
-inline typename Foam::PackedList<nBits>::iteratorBase&
-Foam::PackedList<nBits>::iterator::operator()()
-{
-    return static_cast<iteratorBase&>(*this);
-}
-
-
 template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::const_iterator::operator*() const
@@ -659,14 +650,6 @@ Foam::PackedList<nBits>::const_iterator::operator*() const
 }
 
 
-template<unsigned nBits>
-inline unsigned int
-Foam::PackedList<nBits>::const_iterator::operator()() const
-{
-    return this->get();
-}
-
-
 template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::begin()
@@ -785,7 +768,6 @@ inline void Foam::PackedList<nBits>::resize
                 }
             }
 
-
             // Mask off the (new) final partial segment
             {
                 const unsigned int off = size_ % packing();
@@ -913,7 +895,7 @@ inline void Foam::PackedList<nBits>::clearStorage()
 template<unsigned nBits>
 inline void Foam::PackedList<nBits>::shrink()
 {
-    // Any uneed space allocated?
+    // Any unneeded space allocated?
     const label len = packedLength();
     if (len < StorageList::size())
     {
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 30c6a9110e..2d31afac2c 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -213,10 +213,10 @@ public:
     // Constructors
 
         //- Null constructor
-        inline UList();
+        inline constexpr UList() noexcept;
 
         //- Construct from components
-        inline UList(T* __restrict__ v, label size);
+        inline UList(T* __restrict__ v, label size) noexcept;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index af07e69719..bd41d2ae55 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::UList<T>::UList()
+inline constexpr Foam::UList<T>::UList() noexcept
 :
     size_(0),
     v_(nullptr)
@@ -38,7 +38,7 @@ inline Foam::UList<T>::UList()
 
 
 template<class T>
-inline Foam::UList<T>::UList(T* __restrict__ v, label size)
+inline Foam::UList<T>::UList(T* __restrict__ v, label size) noexcept
 :
     size_(size),
     v_(v)
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index ccfc6308e4..7cff69f33e 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -288,7 +288,7 @@ inline bool operator==(const edge& a, const edge& b);
 inline bool operator!=(const edge& a, const edge& b);
 
 
-//- Hash specialization for hashing edges - a commutative hash value.
+//- Hash specialization for hashing edges as a commutative hash value.
 //  Hash incrementally.
 template<>
 inline unsigned Hash<edge>::operator()(const edge& e, unsigned seed) const
@@ -310,7 +310,7 @@ inline unsigned Hash<edge>::operator()(const edge& e, unsigned seed) const
 }
 
 
-//- Hash specialization for hashing edges - a commutative hash value.
+//- Hash specialization for hashing edges as a commutative hash value.
 //  Hash incrementally.
 template<>
 inline unsigned Hash<edge>::operator()(const edge& e) const
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index fc0069f192..2691c30f09 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -394,13 +394,10 @@ public:
 };
 
 
-//- Hash specialization to offset faces in ListListOps::combineOffset
+//- Specialization to offset faces, used in ListListOps::combineOffset
 template<>
-class offsetOp<face>
+struct offsetOp<face>
 {
-
-public:
-
     inline face operator()
     (
         const face& x,
diff --git a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
index f9feafa610..ad7b55ab6d 100644
--- a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
+++ b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTri.H
@@ -128,13 +128,10 @@ template<>
 inline bool contiguous<labelledTri>()  {return true;}
 
 
-//- Hash specialization to offset faces in ListListOps::combineOffset
+//- Specialization to offset faces, used in ListListOps::combineOffset
 template<>
-class offsetOp<labelledTri>
+struct offsetOp<labelledTri>
 {
-
-public:
-
     inline labelledTri operator()
     (
         const labelledTri& x,
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 2b7f2e62bc..442f1bc16d 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -246,8 +246,8 @@ inline bool operator==(const triFace& a, const triFace& b);
 inline bool operator!=(const triFace& a, const triFace& b);
 
 
-//- Hash specialization for hashing triFace - a commutative hash value.
-//  Hash incrementally.
+//- Hash specialization for triFace as a commutative hash value.
+//  Hashes incrementally.
 template<>
 inline unsigned Hash<triFace>::operator()(const triFace& t, unsigned seed) const
 {
@@ -262,7 +262,7 @@ inline unsigned Hash<triFace>::operator()(const triFace& t, unsigned seed) const
 }
 
 
-//- Hash specialization for hashing triFace - a commutative hash value.
+//- Hash specialization for triFace as a commutative hash value.
 template<>
 inline unsigned Hash<triFace>::operator()(const triFace& t) const
 {
@@ -270,13 +270,10 @@ inline unsigned Hash<triFace>::operator()(const triFace& t) const
 }
 
 
-//- Hash specialization to offset faces in ListListOps::combineOffset
+//- Specialization to offset faces, used in ListListOps::combineOffset
 template<>
-class offsetOp<triFace>
+struct offsetOp<triFace>
 {
-
-public:
-
     inline triFace operator()
     (
         const triFace& x,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
index 2f44c1d9a6..3ad711b0ab 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
@@ -205,13 +205,7 @@ void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
     // Construct boolList from selected elements
     boolList isSelected
     (
-        createWithValues<boolList>
-        (
-            nOldPoints(),
-            false,
-            lst,
-            true
-        )
+        ListOps::createWithValue<bool>(nOldPoints(), lst, true, false)
     );
 
     // Distribute
@@ -227,13 +221,7 @@ void Foam::mapDistributePolyMesh::distributeFaceIndices(labelList& lst) const
     // Construct boolList from selected elements
     boolList isSelected
     (
-        createWithValues<boolList>
-        (
-            nOldFaces(),
-            false,
-            lst,
-            true
-        )
+        ListOps::createWithValue<bool>(nOldFaces(), lst, true, false)
     );
 
     // Distribute
@@ -249,13 +237,7 @@ void Foam::mapDistributePolyMesh::distributeCellIndices(labelList& lst) const
     // Construct boolList from selected elements
     boolList isSelected
     (
-        createWithValues<boolList>
-        (
-            nOldCells(),
-            false,
-            lst,
-            true
-        )
+        ListOps::createWithValue<bool>(nOldCells(), lst, true, false)
     );
 
     // Distribute
@@ -271,12 +253,12 @@ void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
     // Construct boolList from selected elements
     boolList isSelected
     (
-        createWithValues<boolList>
+        ListOps::createWithValue<bool>
         (
-            oldPatchStarts().size(),    // nOldPatches
-            false,
+            oldPatchStarts().size(), // nOldPatches
             lst,
-            true
+            true, // set value
+            false // default value
         )
     );
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index bf98805623..f94ec1da30 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -1413,12 +1413,12 @@ Foam::label Foam::snappyRefineDriver::shellRefine
 
     // mark list to remove any refined faces
     meshRefiner_.userFaceData()[0].first() = meshRefinement::REMOVE;
-    meshRefiner_.userFaceData()[0].second() = createWithValues<labelList>
+    meshRefiner_.userFaceData()[0].second() = ListOps::createWithValue<label>
     (
         mesh.nFaces(),
-        -1,
         meshRefiner_.intersectedFaces(),
-        0
+        0, // set value
+        -1 // default value
     );
 
     // Determine the maximum refinement level over all volume refinement
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index faf88f579d..0d81b99d87 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -1007,7 +1007,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
         }
 
         // Send data back to originating procs. Note that contributions
-        // from different processors get added (ListAppendEqOp)
+        // from different processors get added (ListOps::appendEqOp)
 
         mapDistributeBase::distribute
         (
@@ -1019,7 +1019,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
             map.subMap(),
             false,                      // has flip
             tgtAddress_,
-            ListAppendEqOp<label>(),
+            ListOps::appendEqOp<label>(),
             flipOp(),                   // flip operation
             labelList()
         );
@@ -1034,7 +1034,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
             map.subMap(),
             false,
             tgtWeights_,
-            ListAppendEqOp<scalar>(),
+            ListOps::appendEqOp<scalar>(),
             flipOp(),
             scalarList()
         );
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 0e0f5b063b..0206840ef7 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1084,13 +1084,7 @@ Foam::triSurface Foam::distributedTriSurfaceMesh::subsetMesh
 {
     const boolList include
     (
-        createWithValues<boolList>
-        (
-            s.size(),
-            false,
-            newToOldFaces,
-            true
-        )
+        ListOps::createWithValue<bool>(s.size(), newToOldFaces, true, false)
     );
 
     newToOldPoints.setSize(s.points().size());
diff --git a/src/sampling/surface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C
index f4e09a4da5..a08b8fb964 100644
--- a/src/sampling/surface/isoSurface/isoSurface.C
+++ b/src/sampling/surface/isoSurface/isoSurface.C
@@ -1266,13 +1266,7 @@ Foam::triSurface Foam::isoSurface::subsetMesh
 {
     const boolList include
     (
-        createWithValues<boolList>
-        (
-            s.size(),
-            false,
-            newToOldFaces,
-            true
-        )
+        ListOps::createWithValue<bool>(s.size(), newToOldFaces, true, false)
     );
 
     newToOldPoints.setSize(s.points().size());
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCell.C b/src/sampling/surface/isoSurface/isoSurfaceCell.C
index ab1e6bfdd4..14091a18d0 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceCell.C
@@ -1236,13 +1236,7 @@ Foam::triSurface Foam::isoSurfaceCell::subsetMesh
 {
     const boolList include
     (
-        createWithValues<boolList>
-        (
-            s.size(),
-            false,
-            newToOldFaces,
-            true
-        )
+        ListOps::createWithValue<bool>(s.size(), newToOldFaces, true, false)
     );
 
     newToOldPoints.setSize(s.points().size());

From bcabe827f648ce95ec831d28df76c429faefead3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 6 Mar 2018 11:41:34 +0100
Subject: [PATCH 07/13] ENH: dedicated HashSetOps, HashTableOps namespaces

- relocated HashSetPlusEqOp and HashTablePlusEqOp to
  HashSetOps::plusEqOp and HashTableOps::plusEqOp, respectively

- additional functions for converting between a labelHashSet
  and a PackedBoolList or List<bool>:

  From lists selections to labelHashSet indices:

      HashSetOps::used(const PackedBoolList&);
      HashSetOps::used(const UList<bool>&);

  From labelHashSet to list forms:

      PackedBoolList bitset(const labelHashSet&);
      List<bool> bools(const labelHashSet&);
---
 applications/test/HashSet/Test-hashSet.C      |  56 ++++++-
 applications/test/List/Test-List.C            |  33 ++--
 .../foamToEnsight/findCloudFields.H           |   2 +-
 .../foamToEnsight/foamToEnsight.C             |   2 +-
 .../dataConversion/foamToVTK/findClouds.H     |   2 +-
 .../dataConversion/foamToVTK/foamToVTK.C      |   4 +-
 src/OpenFOAM/Make/files                       |   1 +
 .../containers/HashTables/HashOps/HashOps.C   | 122 ++++++++++++++
 .../containers/HashTables/HashOps/HashOps.H   | 151 ++++++++++++++++++
 .../HashTables/HashTableOps/HashTableOps.H    |  79 ---------
 10 files changed, 340 insertions(+), 112 deletions(-)
 create mode 100644 src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
 create mode 100644 src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
 delete mode 100644 src/OpenFOAM/containers/HashTables/HashTableOps/HashTableOps.H

diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index 425320bc39..eeae7ff0d0 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -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.
@@ -27,13 +27,50 @@ Description
 
 #include "hashedWordList.H"
 #include "nil.H"
+#include "HashOps.H"
 #include "HashSet.H"
 #include "Map.H"
 #include "labelPairHashes.H"
 #include "FlatOutput.H"
 
+#include <algorithm>
+
 using namespace Foam;
 
+template<class Iter>
+void printIf(const Iter& iter)
+{
+    if (iter.found())
+    {
+        Info<< *iter;
+    }
+    else
+    {
+        Info<<"(null)";
+    }
+}
+
+
+template<class Key, class Hash>
+void printMinMax(const HashSet<Key, Hash>& set)
+{
+    const auto first = set.cbegin();
+    const auto last  = set.cend();
+
+    const auto min = std::min_element(first, last);
+    const auto max = std::max_element(first, last);
+
+    Info<< "set: " << flatOutput(set) << nl;
+    Info<< "    min=";
+    printIf(min);
+    Info<< nl;
+
+    Info<< "    max=";
+    printIf(max);
+    Info<< nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
@@ -131,9 +168,14 @@ int main(int argc, char *argv[])
     Info<< "create from Map<label>: ";
     Info<< labelHashSet(mapA) << endl;
 
-    Info<<"combined toc: "
-        << (wordHashSet(setA) | wordHashSet(tableA) | wordHashSet(tableB))
-        << nl;
+    {
+        auto allToc =
+            (wordHashSet(setA) | wordHashSet(tableA) | wordHashSet(tableB));
+
+        Info<<"combined toc: " << flatOutput(allToc) << nl;
+
+        printMinMax(allToc);
+    }
 
     labelHashSet setB
     {
@@ -226,6 +268,12 @@ int main(int argc, char *argv[])
         Info << i << endl;
     }
 
+    printMinMax(setD);
+    Info<< nl;
+
+    printMinMax(labelHashSet());
+    Info<< nl;
+
     Info<< nl << "Test swapping, moving etc." << nl;
     setA.insert({ "some", "more", "entries" });
 
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index 9ed62a26f9..792705904a 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -43,6 +43,7 @@ See also
 
 #include "labelRange.H"
 #include "scalarList.H"
+#include "HashOps.H"
 #include "ListOps.H"
 #include "SubList.H"
 
@@ -473,7 +474,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            PackedBoolList select(locations.toc());
+            PackedBoolList select = HashSetOps::bitset(locations);
             auto output = ListOps::createWithValue<label>
             (
                 30,
@@ -486,16 +487,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            // Fairly really inconvenient way to set true/false
-            labelList toc(locations.sortedToc());
-
-            List<bool> select = ListOps::createWithValue<bool>
-            (
-                toc.last() + 1,
-                toc,
-                true,
-                false  // default value
-            );
+            List<bool> select = HashSetOps::bools(locations);
 
             auto output = ListOps::createWithValue<label>
             (
@@ -524,7 +516,7 @@ int main(int argc, char *argv[])
         }
 
         {
-            PackedBoolList select(locations.toc());
+            PackedBoolList select = HashSetOps::bitset(locations);
             auto output = ListOps::createWithValue<label>
             (
                 30,
@@ -533,20 +525,12 @@ int main(int argc, char *argv[])
                 -1  // default value
             );
             Info<< "with PackedBoolList: " << flatOutput(output)
-                << " selector: " << flatOutput(select.used()) << nl;
+                << " selector: " << flatOutput(HashSetOps::used(select))
+                << nl;
         }
 
         {
-            // Fairly really inconvenient way to set true/false
-            labelList toc(locations.sortedToc());
-
-            List<bool> select = ListOps::createWithValue<bool>
-            (
-                toc.last() + 1,
-                toc,
-                true,
-                false  // default value
-            );
+            List<bool> select = HashSetOps::bools(locations);
 
             auto output = ListOps::createWithValue<label>
             (
@@ -556,7 +540,8 @@ int main(int argc, char *argv[])
                 -1  // default value
             );
             Info<< "with boolList: " << flatOutput(output)
-                << " selector: " << flatOutput(select) << nl;
+                << " selector: " << flatOutput(HashSetOps::used(select))
+                << nl;
         }
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
index c7fec95c0a..895da258ab 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
@@ -62,7 +62,7 @@ if (timeDirs.size() && !noLagrangian)
 
     if (Pstream::parRun())
     {
-        Pstream::mapCombineGather(cloudFields, HashTablePlusEqOp<word>());
+        Pstream::mapCombineGather(cloudFields, HashTableOps::plusEqOp<word>());
         Pstream::mapCombineScatter(cloudFields);
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 6633b330b6..4bd3c8aeaf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -73,7 +73,7 @@ Note
 #include "IOmanip.H"
 #include "OFstream.H"
 #include "PstreamCombineReduceOps.H"
-#include "HashTableOps.H"
+#include "HashOps.H"
 
 #include "fvc.H"
 #include "volFields.H"
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/findClouds.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/findClouds.H
index 0bc5970d75..2b293f1711 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/findClouds.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/findClouds.H
@@ -53,7 +53,7 @@ if (timeDirs.size() && !noLagrangian)
 
     if (Pstream::parRun())
     {
-        Pstream::combineGather(allCloudDirs, HashSetPlusEqOp<word>());
+        Pstream::combineGather(allCloudDirs, HashSetOps::plusEqOp<word>());
         Pstream::combineScatter(allCloudDirs);
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index eb7e697214..7a5351f5cb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -147,7 +147,7 @@ Note
 #include "volPointInterpolation.H"
 #include "emptyPolyPatch.H"
 #include "PstreamCombineReduceOps.H"
-#include "HashTableOps.H"
+#include "HashOps.H"
 #include "labelIOField.H"
 #include "scalarIOField.H"
 #include "sphericalTensorIOField.H"
@@ -1482,7 +1482,7 @@ int main(int argc, char *argv[])
                     Pstream::mapCombineGather
                     (
                         cloudFields,
-                        HashSetPlusEqOp<word>()
+                        HashSetOps::plusEqOp<word>()
                     );
                     Pstream::mapCombineScatter(cloudFields);
                 }
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index ae8af888bf..0ec1cb054f 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -145,6 +145,7 @@ primitives/polynomialEqns/quadraticEqn/quadraticEqn.C
 primitives/Barycentric/barycentric/barycentric.C
 primitives/Barycentric2D/barycentric2D/barycentric2D.C
 
+containers/HashTables/HashOps/HashOps.C
 containers/HashTables/HashTable/HashTableCore.C
 containers/Lists/SortableList/ParSortableListName.C
 containers/Lists/PackedList/PackedListCore.C
diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
new file mode 100644
index 0000000000..494ad5ed4b
--- /dev/null
+++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "HashOps.H"
+#include "PackedBoolList.H"
+
+#include <algorithm>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::labelHashSet Foam::HashSetOps::used(const PackedBoolList& select)
+{
+    const label count = select.count();
+    const label len = select.size();
+
+    labelHashSet output(2*count);
+
+    label used = 0;
+    for (label i = 0; i < len && used < count; ++i)
+    {
+        if (select[i])
+        {
+            output.insert(i);
+            ++used;
+        }
+    }
+
+    return output;
+}
+
+
+Foam::labelHashSet Foam::HashSetOps::used(const UList<bool>& select)
+{
+    // We have no estimate of the size/sparsity, just assume 1/10
+
+    const label len = select.size();
+
+    labelHashSet output(len/10);
+
+    for (label i = 0; i < len; ++i)
+    {
+        if (select[i])
+        {
+            output.insert(i);
+        }
+    }
+
+    return output;
+}
+
+
+Foam::PackedBoolList Foam::HashSetOps::bitset(const labelHashSet& labels)
+{
+    auto const max = std::max_element(labels.cbegin(), labels.cend());
+    const label len = (max.found() ? (1 + *max) : 0);
+
+    if (len <= 0)
+    {
+        return PackedBoolList();
+    }
+
+    PackedBoolList output(len);
+
+    for (const label i : labels)
+    {
+        if (i >= 0)
+        {
+            output.set(i);
+        }
+    }
+
+    return output;
+}
+
+
+Foam::List<bool> Foam::HashSetOps::bools(const labelHashSet& labels)
+{
+    auto const max = std::max_element(labels.cbegin(), labels.cend());
+    const label len = (max.found() ? (1 + *max) : 0);
+
+    if (len <= 0)
+    {
+        return List<bool>();
+    }
+
+    List<bool> output(len, false);
+
+    for (const label i : labels)
+    {
+        if (i >= 0)
+        {
+            output[i] = true;
+        }
+    }
+
+    return output;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
new file mode 100644
index 0000000000..b19f1aca99
--- /dev/null
+++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namspace
+    Foam::HashSetOps
+
+Description
+    Various operations for HashSet.
+
+Namspace
+    Foam::HashTableOps
+
+Description
+    Various operations for HashTable.
+
+SourceFiles
+    HashOps.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef HashOps_H
+#define HashOps_H
+
+#include "HashSet.H"
+#include "List.H"
+
+namespace Foam
+{
+
+// Forward declarations
+
+class PackedBoolList;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+/*---------------------------------------------------------------------------*\
+                       Namespace HashSetOps Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace HashSetOps
+{
+
+//- Combine HashSet operation. Equivalent to 'a += b'
+template<class Key=word, class Hash=string::hash>
+struct plusEqOp
+{
+    typedef HashSet<Key, Hash> value_type;
+
+    void operator()(value_type& a, const value_type& b) const
+    {
+        a += b;
+    }
+};
+
+
+//- Convert a packed list of bits to a labelHashSet of the indices used.
+//
+//  \param selection the list for which a 'true' entry corresponds
+//       to an index for be added to the labelHashSet
+//
+//  \return a labelHashSet of the selected indices
+labelHashSet used(const PackedBoolList& select);
+
+
+//- Convert a list of bools to a labelHashSet of the indices used.
+//
+//  \param selection the list for which a 'true' entry corresponds
+//       to an index for be added to the labelHashSet
+//
+//  \return a labelHashSet of the selected indices
+labelHashSet used(const UList<bool>& select);
+
+
+//- Convert labels to a packed list of bits, with '1' for each
+//- non-negative value and '0' for all others.
+//
+//  \param labels the list of indices.
+//
+//  \return a packed bit list of the selected indices
+//
+//  \note The operation discards any negative values since these are
+//     invalid positions in the output list.
+PackedBoolList bitset(const labelHashSet& labels);
+
+
+//- Convert labels to a list of bools, with 'true' for each
+//- non-negative value and 'false' for all others.
+//
+//  \param labels the list of indices.
+//
+//  \return a bool List of the selected indices
+//
+//  \note The operation discards any negative values since these are
+//     invalid positions in the output list.
+List<bool> bools(const labelHashSet& labels);
+
+
+} // End namespace HashSetOps
+
+
+/*---------------------------------------------------------------------------*\
+                      Namespace HashTableOps Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace HashTableOps
+{
+
+//- Combine HashTable operation. Equivalent to 'a += b'
+template<class T, class Key=word, class Hash=string::hash>
+struct plusEqOp
+{
+    typedef HashTable<T, Key, Hash> value_type;
+
+    void operator()(value_type& a, const value_type& b) const
+    {
+        a += b;
+    }
+};
+
+} // End namespace HashTableOps
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashTableOps/HashTableOps.H b/src/OpenFOAM/containers/HashTables/HashTableOps/HashTableOps.H
deleted file mode 100644
index 20631f776d..0000000000
--- a/src/OpenFOAM/containers/HashTables/HashTableOps/HashTableOps.H
+++ /dev/null
@@ -1,79 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InNamspace
-    Foam
-
-Description
-    Various functions to operate on HashTables.
-
-SourceFiles
-    HashTableOps.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef HashTableOps_H
-#define HashTableOps_H
-
-#include "HashSet.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-//- Combine HashSet operation. Equivalent to 'a += b'
-template<class Key=word, class Hash=string::hash>
-struct HashSetPlusEqOp
-{
-    typedef HashSet<Key, Hash> value_type;
-
-    void operator()(value_type& a, const value_type& b) const
-    {
-        a += b;
-    }
-};
-
-
-//- Combine HashTable operation. Equivalent to 'a += b'
-template<class T, class Key=word, class Hash=string::hash>
-struct HashTablePlusEqOp
-{
-    typedef HashTable<T, Key, Hash> value_type;
-
-    void operator()(value_type& a, const value_type& b) const
-    {
-        a += b;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From fc92d30e745c77878919978111e730f2af75a030 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 4 Mar 2018 20:30:34 +0100
Subject: [PATCH 08/13] ENH: improvements for labelRange

- constexpr, noexcept.
  Added an 'at()' method for returning an iterator within the range
  and changed operator()(label) to have behaviour as per found().
  This makes the labelRange usable as a unary predicate.

- added templated conversion class 'toLabelRange'

- add range() method to polyPatch and surfZone classes, and corresponding
  templated conversion functors.
  For example,

      auto patchDims = ListOps::create<labelRange>
      (
          mesh.boundaryMesh(),
          toLabelRange<polyPatch>()
      );

  to create a List<labelRange> representing the patch extents.
---
 .../polyPatches/polyPatch/polyPatch.H         |  19 +++
 .../primitives/ranges/labelRange/labelRange.C |  41 ++---
 .../primitives/ranges/labelRange/labelRange.H | 151 +++++++++++-------
 .../ranges/labelRange/labelRangeI.H           | 135 ++++++++++------
 src/surfMesh/surfZone/surfZone/surfZone.C     |   2 +-
 src/surfMesh/surfZone/surfZone/surfZone.H     |  25 ++-
 6 files changed, 232 insertions(+), 141 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 2e12697a18..7759f9c546 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -315,6 +315,12 @@ public:
             return start_;
         }
 
+        //- Return start/size range of this patch
+        labelRange range() const
+        {
+            return labelRange(start_, this->size());
+        }
+
         //- Return boundaryMesh reference
         const polyBoundaryMesh& boundaryMesh() const;
 
@@ -423,6 +429,19 @@ public:
 };
 
 
+// Global Functions
+
+//- Get the labelRange for a polyPatch
+template<>
+struct toLabelRange<polyPatch>
+{
+    labelRange operator()(const polyPatch& pp) const
+    {
+        return pp.range();
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
index b0715f8b40..2eb2097918 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
@@ -26,7 +26,6 @@ License
 #include "labelRange.H"
 #include "token.H"
 
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -50,23 +49,19 @@ Foam::labelRange::labelRange(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::labelRange::adjust()
+void Foam::labelRange::adjust() noexcept
 {
     if (start_ < 0)
     {
-        if (size_ <= 0)
-        {
-            size_ = 0;
-        }
-        else
+        if (size_ > 0)  // Second check needed to avoid (negative) overflow
         {
             size_ += start_;
         }
         start_ = 0;
     }
-    else if (size_ < 0)
+    if (size_ < 0)
     {
-        size_ = 0;
+        size_ = 0;  // No negative sizes
     }
 }
 
@@ -96,7 +91,7 @@ bool Foam::labelRange::overlaps(const labelRange& range, bool touches) const
 
 Foam::labelRange Foam::labelRange::join(const labelRange& range) const
 {
-    // trivial cases first
+    // Trivial cases first
     if (!size_)
     {
         return *this;
@@ -128,10 +123,8 @@ Foam::labelRange Foam::labelRange::subset(const labelRange& range) const
     {
         return labelRange(lower, total);
     }
-    else
-    {
-        return labelRange();
-    }
+
+    return labelRange();
 }
 
 
@@ -151,10 +144,8 @@ Foam::labelRange Foam::labelRange::subset
     {
         return labelRange(lower, total);
     }
-    else
-    {
-        return labelRange();
-    }
+
+    return labelRange();
 }
 
 
@@ -170,10 +161,8 @@ Foam::labelRange Foam::labelRange::subset0(const label size) const
     {
         return labelRange(lower, total);
     }
-    else
-    {
-        return labelRange();
-    }
+
+    return labelRange();
 }
 
 
@@ -185,21 +174,19 @@ Foam::Istream& Foam::operator>>(Istream& is, labelRange& range)
     is  >> range.start_ >> range.size_;
     is.readEnd("labelRange");
 
-    is.check(FUNCTION_NAME);
-
-    // Disallow invalid sizes
     if (range.size_ < 0)
     {
-        range.size_ = 0;
+        range.size_ = 0;  // No negative sizes
     }
 
+    is.check(FUNCTION_NAME);
     return is;
 }
 
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const labelRange& range)
 {
-    // Write ASCII only for now
+    // Only write as ASCII for now
     os  << token::BEGIN_LIST
         << range.start() << token::SPACE << range.size()
         << token::END_LIST;
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
index dc3483c109..9143be2e97 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.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.
@@ -42,12 +42,11 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
+class labelRange;
 class Istream;
 class Ostream;
 
-// Forward declaration of friend functions and operators
-class labelRange;
 Istream& operator>>(Istream& is, labelRange& range);
 Ostream& operator<<(Ostream& os, const labelRange& range);
 
@@ -57,13 +56,28 @@ Ostream& operator<<(Ostream& os, const labelRange& range);
 
 class labelRange
 {
-    // Private data
+    // Private Data
 
+        //- The start point for the interval
         label start_;
+
+        //- The length of the interval
         label size_;
 
 public:
 
+    // STL type definitions
+
+        //- Type of values the range contains
+        typedef label value_type;
+
+        //- The type that can represent the size of the range
+        typedef label size_type;
+
+        //- Forward iterator with const access
+        class const_iterator;
+
+
     // Static Data Members
 
         static int debug;
@@ -72,22 +86,13 @@ public:
         static const labelRange null;
 
 
-    // STL type definitions similar to what UList has
-
-        //- Type of values the range contains
-        typedef label value_type;
-
-        //- The type that can represent the size of the range
-        typedef label size_type;
-
-        // Forward declaration
-        class const_iterator;
-
-
     // Constructors
 
         //- An empty range with zero for start/size.
-        inline labelRange();
+        inline constexpr labelRange() noexcept;
+
+        //- Construct a range from start/size, enforcing non-negative size.
+        inline labelRange(const label start, const label size) noexcept;
 
         //- Construct a range from start/size, enforcing non-negative size.
         //  Optionally adjust the start to avoid any negative indices.
@@ -95,8 +100,8 @@ public:
         (
             const label start,
             const label size,
-            const bool adjustStart = false
-        );
+            const bool adjustStart
+        ) noexcept;
 
         //- Construct from Istream.
         labelRange(Istream& is);
@@ -105,68 +110,75 @@ public:
     // Static Member Functions
 
         //- An identity range with range[i] == i.
-        inline static labelRange identity(const label len);
+        inline static labelRange identity(const label len) noexcept;
 
 
     // Member Functions
 
-        //- Adjust start position
-        inline void setStart(const label i);
+        //- Change the start position
+        inline void setStart(const label i) noexcept;
 
-        //- Adjust size
-        inline void setSize(const label n);
+        //- Change the size
+        inline void resize(const label n) noexcept;
 
-        //- Alias for setSize()
-        inline void resize(const label n);
+        //- Change the size - alias for resize()
+        inline void setSize(const label n) noexcept;
 
         //- Decrease the size by 1, but never below 0.
-        inline void decrement();
+        inline void decrement() noexcept;
 
         //- Increase the size by 1.
-        inline void increment();
+        inline void increment() noexcept;
 
         //- Reset to zero start and zero size
-        inline void clear();
+        inline void clear() noexcept;
 
         //- Is the range empty?
-        inline bool empty() const;
+        inline bool empty() const noexcept;
 
-        //- Adjust the start to avoid any negative indices
-        void adjust();
+        //- Adjust the start to avoid negative indices.
+        //  The size is decreased accordingly, but will never become negative.
+        //  Eg, adjusting (-10, 15) becomes (0,5).
+        //  adjusting (-20, 15) becomes (0,0)
+        void adjust() noexcept;
 
         //- Is the range non-empty?
-        inline bool valid() const;
+        inline bool valid() const noexcept;
 
         //- The (inclusive) lower value of the range
-        inline label start() const;
+        inline label start() const noexcept;
 
         //- The effective size of the range
-        inline label size() const;
+        inline label size() const noexcept;
 
         //- The (inclusive) lower value of the range - same as start
-        inline label first() const;
+        inline label first() const noexcept;
 
         //- The (inclusive) upper value of the range
-        inline label last() const;
+        inline label last() const noexcept;
 
         //- The value before the start of the range
-        inline label before() const;
+        inline label before() const noexcept;
 
         //- The value after the last element in the range
-        inline label after() const;
+        inline label after() const noexcept;
+
+        //- Reset start and size, enforcing non-negative size.
+        //  \return true if the updated range is valid (non-empty).
+        inline bool reset(const label start, const label size) noexcept;
 
         //- Reset start and size, enforcing non-negative size.
         //  Optionally adjust the start to avoid any negative indices.
-        //  Return true if the updated range valid (non-empty).
+        //  \return true if the updated range is valid (non-empty).
         inline bool reset
         (
             const label start,
             const label size,
-            const bool adjustStart = false
-        );
+            const bool adjustStart
+        ) noexcept;
 
-        //- Return true if the value is located the range
-        inline bool found(const label value) const;
+        //- Return true if the (global) value is located within the range
+        inline bool found(const label value) const noexcept;
 
         //- Return true if the ranges overlap.
         //  Optional test for ranges that also just touch each other
@@ -192,21 +204,29 @@ public:
         labelRange subset0(const label size) const;
 
 
+        //- Return const_iterator to element at in the range, with bounds
+        //- checking.
+        //  \return iterator at the requested position, or end() if it is
+        //      out of bounds
+        inline const_iterator at(const label localIndex) const;
+
+
     // Member Operators
 
-        //- Return element in the range, no bounds checking
-        inline label operator[](const label localIndex) const;
+        //- Return element in the range, without bounds checking
+        inline label operator[](const label localIndex) const noexcept;
 
-        //- Return const_iterator to element in the range
-        inline const_iterator operator()(const label localIndex) const;
+        //- Return true if the (global) value is located within the range.
+        //  Behaviour identical to found().
+        inline bool operator()(const label value) const noexcept;
 
         //- Increase the size by 1.
-        inline label operator++();
-        inline label operator++(int);
+        inline label operator++() noexcept;
+        inline label operator++(int) noexcept;
 
         //- Decrease the size by 1, but never below 0.
-        inline label operator--();
-        inline label operator--(int);
+        inline label operator--() noexcept;
+        inline label operator--(int) noexcept;
 
 
     // STL iterator
@@ -223,7 +243,7 @@ public:
                 const label&
             >
         {
-            //- The current (global) value
+            //- The current (global) index value
             label value_;
 
         public:
@@ -231,7 +251,8 @@ public:
           // Constructors
 
             //- Construct from range at given local index.
-            //  A negative index is invalid and corresponds to the 'end'
+            //  If the local index is out of range (eg, negaative),
+            //  this creates the 'end' iterator
             inline const_iterator(const labelRange* range, const label i=0);
 
           // Member operators
@@ -270,22 +291,28 @@ public:
 };
 
 
+// Global Functions
+
+//- Conversion to labelRange operations
+template<class Type> struct toLabelRange {};
+
+
 // Global Operators
 
-inline bool operator==(const labelRange& a, const labelRange& b)
+inline bool operator==(const labelRange& a, const labelRange& b) noexcept
 {
     return (a.first() == b.first() && a.size() == b.size());
 }
 
-inline bool operator!=(const labelRange& a, const labelRange& b)
+inline bool operator!=(const labelRange& a, const labelRange& b) noexcept
 {
-    return !(a == b);
+    return (a.first() != b.first() || a.size() != b.size());
 }
 
 
 //- Comparison function for sorting, compares the start.
 //  If the start values are equal, also compares the size.
-inline bool operator<(const labelRange& a, const labelRange& b)
+inline bool operator<(const labelRange& a, const labelRange& b) noexcept
 {
     return
     (
@@ -298,18 +325,18 @@ inline bool operator<(const labelRange& a, const labelRange& b)
     );
 }
 
-inline bool operator<=(const labelRange& a, const labelRange& b)
+inline bool operator<=(const labelRange& a, const labelRange& b) noexcept
 {
     return !(b < a);
 }
 
 
-inline bool operator>(const labelRange& a, const labelRange& b)
+inline bool operator>(const labelRange& a, const labelRange& b) noexcept
 {
     return (b < a);
 }
 
-inline bool operator>=(const labelRange& a, const labelRange& b)
+inline bool operator>=(const labelRange& a, const labelRange& b) noexcept
 {
     return !(a < b);
 }
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
index dc0e90ae85..2ae0bb7231 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.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.
@@ -23,35 +23,47 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::labelRange::labelRange()
+inline constexpr Foam::labelRange::labelRange() noexcept
 :
     start_(0),
     size_(0)
 {}
 
 
+inline Foam::labelRange::labelRange
+(
+    const label start,
+    const label size
+) noexcept
+:
+    start_(start),
+    size_(size)
+{
+    if (size_ < 0)
+    {
+        size_ = 0;  // No negative sizes
+    }
+}
+
 inline Foam::labelRange::labelRange
 (
     const label start,
     const label size,
     const bool adjustStart
-)
+) noexcept
 :
     start_(start),
     size_(size)
 {
     if (adjustStart)
     {
-        // Disallow invalid indices and sizes
-        adjust();
+        adjust(); // Eliminate negative start, adjust size accordingly
     }
     else if (size_ < 0)
     {
-        // Disallow invalid sizes
-        size_ = 0;
+        size_ = 0;  // No negative sizes
     }
 }
 
@@ -89,7 +101,7 @@ Foam::labelRange::const_iterator::operator++()
 inline Foam::labelRange::const_iterator
 Foam::labelRange::const_iterator::operator++(int)
 {
-    const_iterator old = *this;
+    const_iterator old(*this);
     ++value_;
     return old;
 }
@@ -125,6 +137,14 @@ inline Foam::labelRange::const_iterator Foam::labelRange::cbegin() const
 }
 
 
+inline Foam::labelRange::const_iterator
+Foam::labelRange::at(const label localIndex) const
+{
+    // The constructor handles out-of-range properly
+    return const_iterator(this, localIndex);
+}
+
+
 inline const Foam::labelRange::const_iterator Foam::labelRange::end() const
 {
     return const_iterator(this, -1);
@@ -139,93 +159,94 @@ inline const Foam::labelRange::const_iterator Foam::labelRange::cend() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::labelRange Foam::labelRange::identity(const label len)
+inline Foam::labelRange Foam::labelRange::identity(const label len) noexcept
 {
     return labelRange(0, len);
 }
 
 
-inline void Foam::labelRange::setStart(const label i)
+inline void Foam::labelRange::setStart(const label i) noexcept
 {
     start_ = i;
 }
 
 
-inline void Foam::labelRange::setSize(const label n)
+inline void Foam::labelRange::resize(const label n) noexcept
 {
     size_ = n;
-    if (size_ < 0) size_ = 0;
+    if (size_ < 0) size_ = 0;  // No negative sizes
 }
 
 
-inline void Foam::labelRange::resize(const label n)
+inline void Foam::labelRange::setSize(const label n) noexcept
 {
-    setSize(n);
+    size_ = n;
+    if (size_ < 0) size_ = 0;  // No negative sizes
 }
 
 
-inline void Foam::labelRange::decrement()
+inline void Foam::labelRange::decrement() noexcept
 {
     --size_;
-    if (size_ < 0) size_ = 0;
+    if (size_ < 0) size_ = 0;  // No negative sizes
 }
 
 
-inline void Foam::labelRange::increment()
+inline void Foam::labelRange::increment() noexcept
 {
     ++size_;
 }
 
 
-inline void Foam::labelRange::clear()
+inline void Foam::labelRange::clear() noexcept
 {
     start_ = size_ = 0;
 }
 
 
-inline bool Foam::labelRange::empty() const
+inline bool Foam::labelRange::empty() const noexcept
 {
     return !size_;
 }
 
 
-inline bool Foam::labelRange::valid() const
+inline bool Foam::labelRange::valid() const noexcept
 {
     return size_;
 }
 
 
-inline Foam::label Foam::labelRange::size() const
+inline Foam::label Foam::labelRange::size() const noexcept
 {
     return size_;
 }
 
 
-inline Foam::label Foam::labelRange::start() const
+inline Foam::label Foam::labelRange::start() const noexcept
 {
     return start_;
 }
 
 
-inline Foam::label Foam::labelRange::first() const
+inline Foam::label Foam::labelRange::first() const noexcept
 {
     return start_;
 }
 
 
-inline Foam::label Foam::labelRange::last() const
+inline Foam::label Foam::labelRange::last() const noexcept
 {
     return start_ + size_ - 1;
 }
 
 
-inline Foam::label Foam::labelRange::before() const
+inline Foam::label Foam::labelRange::before() const noexcept
 {
     return start_ - 1;
 }
 
 
-inline Foam::label Foam::labelRange::after() const
+inline Foam::label Foam::labelRange::after() const noexcept
 {
     return start_ + size_;
 }
@@ -234,29 +255,45 @@ inline Foam::label Foam::labelRange::after() const
 inline bool Foam::labelRange::reset
 (
     const label start,
-    const label size,
-    const bool adjustStart
-)
+    const label size
+) noexcept
 {
     start_ = start;
     size_  = size;
 
-    if (adjustStart)
+    if (size_ < 0)
     {
-        // Disallow invalid indices and sizes
-        adjust();
-    }
-    else if (size_ < 0)
-    {
-        // Disallow invalid sizes
-        size_ = 0;
+        size_ = 0;  // No negative sizes
     }
 
     return size_;
 }
 
 
-inline bool Foam::labelRange::found(const label value) const
+inline bool Foam::labelRange::reset
+(
+    const label start,
+    const label size,
+    const bool adjustStart
+) noexcept
+{
+    start_ = start;
+    size_  = size;
+
+    if (adjustStart)
+    {
+        adjust(); // Eliminate negative start, adjust size accordingly
+    }
+    else if (size_ < 0)
+    {
+        size_ = 0;  // No negative sizes
+    }
+
+    return size_;
+}
+
+
+inline bool Foam::labelRange::found(const label value) const noexcept
 {
     return (value >= this->first() && value <= this->last());
 }
@@ -264,41 +301,43 @@ inline bool Foam::labelRange::found(const label value) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::labelRange::operator[](const label localIndex) const
+inline Foam::label Foam::labelRange::operator[]
+(
+    const label localIndex
+) const noexcept
 {
     return start_ + localIndex;
 }
 
 
-inline Foam::labelRange::const_iterator
-Foam::labelRange::operator()(const label localIndex) const
+inline bool Foam::labelRange::operator()(const label value) const noexcept
 {
-    return const_iterator(this, localIndex);
+    return found(value);
 }
 
 
-inline Foam::label Foam::labelRange::operator++()
+inline Foam::label Foam::labelRange::operator++() noexcept
 {
     return ++size_;
 }
 
 
-inline Foam::label Foam::labelRange::operator++(int)
+inline Foam::label Foam::labelRange::operator++(int) noexcept
 {
     return size_++;
 }
 
 
-inline Foam::label Foam::labelRange::operator--()
+inline Foam::label Foam::labelRange::operator--() noexcept
 {
     decrement();
     return size_;
 }
 
 
-inline Foam::label Foam::labelRange::operator--(int)
+inline Foam::label Foam::labelRange::operator--(int) noexcept
 {
-    const label old = size_;
+    const label old(size_);
     decrement();
     return old;
 }
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index b51cdcf60b..11ddea7da9 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(surfZone, 0);
+    defineTypeNameAndDebug(surfZone, 0);
 }
 
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index c7692c4643..40a4348654 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.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.
@@ -41,6 +41,7 @@ SourceFiles
 #include "label.H"
 #include "className.H"
 #include "surfZoneIdentifier.H"
+#include "labelRange.H"
 #include "autoPtr.H"
 #include "dictionary.H"
 
@@ -49,8 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
-
+// Forward declarations
 class surfZone;
 
 Istream& operator>>(Istream&, surfZone&);
@@ -153,6 +153,12 @@ public:
             return size_;
         }
 
+        //- Return start/size range of this zone
+        labelRange range() const
+        {
+            return labelRange(start_, size_);
+        }
+
         //- Write
         void write(Ostream&) const;
 
@@ -175,6 +181,19 @@ public:
 };
 
 
+// Global Functions
+
+//- Get the labelRange for a surfZone
+template<>
+struct toLabelRange<surfZone>
+{
+    labelRange operator()(const surfZone& zone) const
+    {
+        return zone.range();
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

From 660f3e5492f9589f0f742b112da75543ca9acc4f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 26 Feb 2018 12:00:00 +0100
Subject: [PATCH 09/13] ENH: cleanup autoPtr class (issue #639)

Improve alignment of its behaviour with std::unique_ptr

  - element_type typedef
  - release() method - identical to ptr() method
  - get() method to get the pointer without checking and without releasing it.
  - operator*() for dereferencing

Method name changes

  - renamed rawPtr() to get()
  - renamed rawRef() to ref(), removed unused const version.

Removed methods/operators

  - assignment from a raw pointer was deleted (was rarely used).
    Can be convenient, but uncontrolled and potentially unsafe.
    Do allow assignment from a literal nullptr though, since this
    can never leak (and also corresponds to the unique_ptr API).

Additional methods

  - clone() method: forwards to the clone() method of the underlying
    data object with argument forwarding.

  - reset(autoPtr&&) as an alternative to operator=(autoPtr&&)

STYLE: avoid implicit conversion from autoPtr to object type in many places

- existing implementation has the following:

     operator const T&() const { return operator*(); }

  which means that the following code works:

       autoPtr<mapPolyMesh> map = ...;
       updateMesh(*map);    // OK: explicit dereferencing
       updateMesh(map());   // OK: explicit dereferencing
       updateMesh(map);     // OK: implicit dereferencing

  for clarity it may preferable to avoid the implicit dereferencing

- prefer operator* to operator() when deferenced a return value
  so it is clearer that a pointer is involve and not a function call
  etc    Eg,   return *meshPtr_;  vs.  return meshPtr_();
---
 .../solvers/combustion/PDRFoam/createFields.H |   4 +-
 .../twoPhaseMixtureThermo.H                   |   8 +-
 .../phaseModel/phaseModel.C                   |   2 +-
 .../phaseModel/phaseModel.H                   |   4 +-
 ...incompressibleTwoPhaseInteractingMixture.H |   4 +-
 .../incompressibleThreePhaseMixture.H         |   6 +-
 .../multiphaseSystem/phaseModel/phaseModel.C  |   2 +-
 .../multiphaseSystem/phaseModel/phaseModel.H  |   4 +-
 .../multiphaseMixture/phase/phase.C           |   2 +-
 .../multiphaseMixture/phase/phase.H           |   2 +-
 .../HeatAndMassTransferPhaseSystem.C          |  49 +---
 .../HeatTransferPhaseSystem.C                 |  12 +-
 ...terfaceCompositionPhaseChangePhaseSystem.C |  34 +--
 .../MomentumTransferPhaseSystem.C             | 101 ++-----
 .../ThermalPhaseChangePhaseSystem.C           |  48 +---
 .../MovingPhaseModel/MovingPhaseModel.C       |   2 +-
 .../phaseModel/phaseModel/phaseModel.C        |   2 +-
 .../phaseSystem/phaseSystemTemplates.C        |  10 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |   9 +-
 .../IATE/IATEsources/IATEsource/IATEsource.H  |   2 +-
 .../BlendedInterfacialModel.C                 |   8 +-
 .../IATE/IATEsources/IATEsource/IATEsource.H  |   2 +-
 .../twoPhaseSystem/phaseModel/phaseModel.C    |   4 +-
 .../twoPhaseSystem/phaseModel/phaseModel.H    |   8 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  62 ++---
 .../solidDisplacementFoam/createFields.H      |   2 +-
 applications/test/autoPtr/Make/files          |   3 +
 applications/test/autoPtr/Make/options        |   5 +
 applications/test/autoPtr/Test-autoPtr.C      | 219 +++++++++++++++
 .../test/fieldMapping/Test-fieldMapping.C     |   4 +-
 applications/test/hexRef8/Test-hexRef8.C      |   4 +-
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C |   8 +-
 .../advanced/collapseEdges/collapseEdges.C    |  10 +-
 .../combinePatchFaces/combinePatchFaces.C     |   6 +-
 .../advanced/refineHexMesh/refineHexMesh.C    |   4 +-
 .../mesh/advanced/removeFaces/removeFaces.C   |  10 +-
 .../mesh/advanced/selectCells/selectCells.C   |  12 +-
 .../mesh/conversion/ccm/ccmToFoam/ccmToFoam.C |   4 +-
 .../mesh/conversion/star4ToFoam/star4ToFoam.C |   2 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |   2 +-
 .../extrude/extrudeMesh/extrudeMesh.C         |   8 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C |   4 +-
 .../extrude2DMesh/extrude2DMeshApp.C          |   4 +-
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  10 +-
 .../DelaunayMesh/DistributedDelaunayMesh.H    |   2 +-
 .../backgroundMeshDecomposition.C             |  24 +-
 .../backgroundMeshDecomposition.H             |   2 +-
 .../backgroundMeshDecompositionI.H            |   2 +-
 .../conformalVoronoiMesh.C                    |   6 +-
 .../conformalVoronoiMeshI.H                   |   2 +-
 .../conformalVoronoiMeshTemplates.C           |   2 +-
 .../initialPointsMethod/initialPointsMethod.C |   6 -
 .../initialPointsMethod/initialPointsMethod.H |   4 +-
 .../searchableSurfaceFeatures.H               |   2 +-
 .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C   |   2 +-
 .../manipulation/checkMesh/checkGeometry.C    |   6 +-
 .../manipulation/checkMesh/checkTopology.C    |   6 +-
 .../createBaffles/createBaffles.C             |   5 +-
 .../faceSelection/faceSelection.H             |   2 +-
 .../faceSelection/faceZoneSelection.H         |   2 +-
 .../searchableSurfaceSelection.H              |   2 +-
 .../mergeOrSplitBaffles/mergeOrSplitBaffles.C |   4 +-
 .../polyDualMesh/polyDualMeshApp.C            |   2 +-
 .../manipulation/renumberMesh/renumberMesh.C  |   2 +-
 .../mesh/manipulation/setSet/setSet.C         |   4 +-
 .../reconstructParMesh/reconstructParMesh.C   |   8 +-
 .../redistributePar/redistributePar.C         |  19 +-
 .../ensightOutputCloudTemplates.C             |   2 +-
 .../ensightOutputSerialCloudTemplates.C       |   2 +-
 .../foamToEnsightParts/foamToEnsightParts.C   |   2 +-
 .../foamToVTK/foamVtkLagrangianWriter.H       |   2 +-
 .../miscellaneous/pdfPlot/createFields.H      |   2 +-
 .../searchableSurfaceModifier/autoPatch.H     |   2 +-
 .../searchableSurfaceModifier/cut.H           |   2 +-
 .../searchableSurfaceModifier.H               |   2 +-
 .../dynamicIndexedOctree.C                    |  42 ++-
 .../dynamicIndexedOctree.H                    |   2 +-
 .../decomposedBlockData/decomposedBlockData.C |  78 +++---
 src/OpenFOAM/db/IOstreams/token/token.C       |   6 -
 src/OpenFOAM/db/IOstreams/token/token.H       |  22 +-
 src/OpenFOAM/db/Time/Time.H                   |   2 +-
 src/OpenFOAM/db/dictionary/entry/entryIO.C    |   2 +-
 .../functionObject/functionObject.H           |   2 +-
 .../functionObjectList/functionObjectList.C   |   4 +-
 .../timeControl/timeControlFunctionObjectI.H  |   2 +-
 .../db/functionObjects/writeFile/writeFile.C  |   2 +-
 src/OpenFOAM/db/regIOobject/regIOobjectRead.C |   4 +-
 .../codedFixedValuePointPatchField.C          |   2 +-
 .../uniformFixedValuePointPatchField.C        |   6 +-
 .../fileOperation/fileOperation.C             |   7 +-
 .../LUscalarMatrix/procLduInterface.H         |   2 +-
 .../lduMatrix/lduMatrixPreconditioner.C       |   2 +-
 .../lduMatrix/lduMatrix/lduMatrixSmoother.C   |   2 +-
 .../lduMatrix/lduMatrix/lduMatrixSolver.C     |   2 +-
 .../GAMGAgglomeration/GAMGAgglomeration.C     |   2 +-
 src/OpenFOAM/memory/autoPtr/autoPtr.H         | 255 +++++++++++++-----
 src/OpenFOAM/memory/autoPtr/autoPtrI.H        | 233 ++++++++++------
 .../polyMesh/globalMeshData/globalMeshData.C  |  59 ++--
 .../polyMesh/globalMeshData/globalPoints.H    |   4 +-
 .../mapDistribute/mapDistributeBase.C         |   2 +-
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.C |  12 +-
 .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H |   2 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       |   7 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  12 +-
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     |   2 +-
 .../constraint/processor/processorPolyPatch.C |   4 +-
 .../functions/Function1/Scale/Scale.C         |   4 +-
 .../functions/Function1/Sine/Sine.C           |   8 +-
 .../functions/Function1/Square/Square.C       |   8 +-
 .../functions/Function1/Table/TableBase.C     |   2 +-
 ...allHeatFluxTemperatureFvPatchScalarField.C |   6 +-
 .../thermalBaffle1DFvPatchScalarField.C       |   2 +-
 .../turbulenceModels/LES/LESModel/LESModel.H  |   2 +-
 .../LES/LESdeltas/IDDESDelta/IDDESDelta.H     |   2 +-
 .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H           |   2 +-
 .../porousBafflePressureFvPatchField.C        |  14 +-
 .../psiThermoCombustion/psiThermoCombustion.C |   4 +-
 .../rhoThermoCombustion/rhoThermoCombustion.C |   4 +-
 src/conversion/common/reader/meshReader.C     |  15 +-
 src/conversion/ensight/mesh/ensightMeshI.H    |   2 +-
 .../ensight/mesh/ensightMeshOptions.C         |   4 +-
 src/conversion/ensight/output/ensightOutput.H |   2 +-
 .../ensight/output/ensightSerialOutput.H      |   4 +-
 .../vtk/output/foamVtkInternalWriter.H        |   2 +-
 .../vtk/output/foamVtkPatchWriter.H           |   2 +-
 .../vtk/output/foamVtkSurfaceMeshWriter.H     |   2 +-
 .../dynamicMotionSolverFvMesh.C               |   2 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |  61 ++---
 .../extrudePatchMesh/extrudePatchMesh.C       |  12 +-
 .../extrudePatchMesh/extrudePatchMesh.H       |   2 +-
 src/dynamicMesh/fvMeshAdder/fvMeshAdder.C     |  31 +--
 .../fvMeshDistribute/fvMeshDistribute.C       |  25 +-
 src/dynamicMesh/fvMeshSubset/fvMeshSubset.C   |   6 +-
 src/dynamicMesh/meshCut/cellCuts/cellCuts.H   |   2 +-
 .../meshCut/cellLooper/cellLooper.H           |   2 +-
 .../multiDirRefinement/multiDirRefinement.C   |   2 +-
 ...yMotionDisplacementPointPatchVectorField.C |   2 +-
 ...yMotionDisplacementPointPatchVectorField.H |   2 +-
 .../motionSolvers/motionSolver/motionSolver.C |   2 +-
 .../polyMeshAdder/faceCoupleInfo.H            |   6 +-
 .../polyTopoChange/hexRef8/hexRef8.C          |   2 +-
 .../polyTopoChanger/polyTopoChanger.C         |   2 +-
 .../repatchPolyTopoChanger.C                  |   2 +-
 src/engine/enginePiston/enginePiston.H        |   2 +-
 src/engine/engineValve/engineValve.H          |   2 +-
 .../cfdTools/general/MRF/MRFZone.H            |   2 +-
 .../cfdTools/general/fvOptions/fvOption.H     |   2 +-
 .../porosityModel/porosityModel.C             |   2 +-
 .../codedFixedValueFvPatchField.C             |   2 +-
 .../codedMixed/codedMixedFvPatchField.C       |   2 +-
 ...lindricalInletVelocityFvPatchVectorField.C |  18 +-
 .../derived/fixedMean/fixedMeanFvPatchField.C |   6 +-
 .../fixedProfile/fixedProfileFvPatchField.C   |   6 +-
 .../flowRateInletVelocityFvPatchVectorField.C |   6 +-
 ...flowRateOutletVelocityFvPatchVectorField.C |   6 +-
 ...ureInletOutletVelocityFvPatchVectorField.C |   6 +-
 ...ureInletOutletVelocityFvPatchVectorField.H |   2 +-
 .../rotatingTotalPressureFvPatchScalarField.C |   6 +-
 .../rotatingWallVelocityFvPatchVectorField.C  |   8 +-
 ...lFlowRateInletVelocityFvPatchVectorField.C |  12 +-
 .../swirlInletVelocityFvPatchVectorField.C    |  18 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |   6 +-
 ...ranslatingWallVelocityFvPatchVectorField.C |   8 +-
 .../turbulentDFSEMInletFvPatchVectorField.C   |   2 +-
 .../uniformFixedGradientFvPatchField.C        |   6 +-
 .../uniformFixedValueFvPatchField.C           |   6 +-
 .../uniformInletOutletFvPatchField.C          |   6 +-
 .../uniformJump/uniformJumpFvPatchField.C     |   6 +-
 .../uniformJumpAMIFvPatchField.C              |   6 +-
 .../uniformTotalPressureFvPatchScalarField.C  |   6 +-
 ...tFlowRateInletVelocityFvPatchVectorField.C |   6 +-
 .../CrankNicolsonDdtScheme.C                  |   5 +-
 .../extendedCentredCellToCellStencil.H        |   2 +-
 .../extendedCentredCellToFaceStencil.H        |   2 +-
 .../extendedUpwindCellToFaceStencil.H         |   4 +-
 .../extendedCentredFaceToCellStencil.H        |   2 +-
 .../field/streamLine/streamLineBase.C         |   2 +-
 .../codedFunctionObject/codedFunctionObject.C |   2 +-
 .../utilities/ensightWrite/ensightWrite.H     |   4 +-
 .../displacementSBRStressFvMotionSolver.H     |   2 +-
 .../displacementLaplacianFvMotionSolver.C     |   3 +-
 ...dBodyDisplacementLaplacianFvMotionSolver.C |   3 +-
 ...surfaceDisplacementPointPatchVectorField.C |   3 +-
 ...aceSlipDisplacementPointPatchVectorField.C |   3 +-
 ...meVaryingMappedFixedValuePointPatchField.C |   6 +-
 .../interRegionOption/interRegionOptionI.H    |   2 +-
 .../jouleHeatingSource/jouleHeatingSource.C   |   2 +-
 .../sources/general/codedSource/CodedSource.C |   2 +-
 .../interRegionHeatTransferModelI.H           |   4 +-
 .../tabulatedHeatTransfer.C                   |   4 +-
 .../tabulatedNTUHeatTransfer.C                |   2 +-
 .../variableHeatTransfer.C                    |   8 +-
 .../variableHeatTransfer.H                    |   9 +-
 .../clouds/Templates/DSMCCloud/DSMCCloudI.H   |  10 +-
 .../InteractionLists/InteractionListsI.H      |   4 +-
 .../CollidingCloud/CollidingCloudI.H          |   6 +-
 .../Templates/KinematicCloud/KinematicCloud.C |   7 -
 .../Templates/KinematicCloud/KinematicCloud.H |   2 +-
 .../KinematicCloud/KinematicCloudI.H          |  30 +--
 .../clouds/Templates/MPPICCloud/MPPICCloudI.H |  14 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |   7 -
 .../Templates/ReactingCloud/ReactingCloud.H   |   2 +-
 .../Templates/ReactingCloud/ReactingCloudI.H  |   8 +-
 .../ReactingMultiphaseCloudI.H                |   6 +-
 .../Templates/ThermoCloud/ThermoCloud.C       |   7 -
 .../Templates/ThermoCloud/ThermoCloud.H       |   2 +-
 .../Templates/ThermoCloud/ThermoCloudI.H      |  38 ++-
 .../KinematicParcelTrackingDataI.H            |   6 +-
 .../MPPICParcel/MPPICParcelTrackingDataI.H    |   6 +-
 .../ReactingParcelTrackingDataI.H             |   2 +-
 .../ThermoParcel/ThermoParcelTrackingDataI.H  |   8 +-
 .../ParticleTracks/ParticleTracksI.H          |   2 +-
 .../CellZoneInjection/CellZoneInjection.C     |   2 +-
 .../ConeInjection/ConeInjection.C             |   2 +-
 .../ConeNozzleInjection/ConeNozzleInjection.C |   2 +-
 .../FieldActivatedInjection.C                 |   2 +-
 .../InflationInjection/InflationInjection.C   |   2 +-
 .../ManualInjection/ManualInjection.C         |   2 +-
 .../PatchFlowRateInjection.C                  |   2 +-
 .../PatchInjection/PatchInjection.C           |   2 +-
 .../Lift/LiftForce/LiftForceI.H               |   2 +-
 .../PressureGradient/PressureGradientForceI.H |   2 +-
 .../LocalInteraction/LocalInteraction.C       |   4 +-
 .../AveragingMethod/AveragingMethod.C         |   7 -
 .../AveragingMethod/AveragingMethod.H         |   2 +-
 .../MPPIC/AveragingMethods/Dual/Dual.C        |  26 +-
 .../MPPIC/AveragingMethods/Dual/Dual.H        |  12 +-
 .../pairPotentialList/pairPotentialListI.H    |   3 +-
 .../clouds/Templates/SprayCloud/SprayCloudI.H |   6 +-
 src/lumpedPointMotion/lumpedPointMovement.C   |   2 +-
 .../blockEdges/blockEdge/blockEdge.C          |   2 +-
 .../blockFaces/blockFace/blockFace.C          |   2 +-
 .../blockVertices/blockVertex/blockVertex.C   |   4 +-
 src/mesh/blockMesh/blocks/block/block.H       |   2 +-
 .../displacementMeshMoverMotionSolver.C       |   2 +-
 .../medialAxisMeshMover.C                     |   4 +-
 .../meshRefinement/meshRefinement.C           |  46 ++--
 .../meshRefinement/meshRefinementBaffles.C    |  60 +++--
 .../meshRefinement/meshRefinementMerge.C      |  44 +--
 .../meshRefinement/meshRefinementRefine.C     |   9 +-
 .../refinementFeatures/refinementFeatures.C   |   3 +-
 .../snappyHexMeshDriver/snappyLayerDriver.C   |  66 ++---
 .../AMIInterpolation/AMIInterpolationI.H      |   4 +-
 .../cyclicACMIGAMGInterface.H                 |   2 +-
 .../cyclicAMIGAMGInterface.H                  |   2 +-
 .../cyclicACMIPointPatchField.H               |   4 +-
 .../cyclicAMIPointPatchField.H                |   4 +-
 .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C   |   2 +-
 .../coordinateRotation/cylindrical.C          |   8 +-
 .../coordinateRotation/cylindrical.H          |   2 +-
 .../coordinateSystems/coordinateSystem.C      |  92 ++++---
 .../coordinateSystems/coordinateSystem.H      |  34 ++-
 src/meshTools/edgeMesh/edgeMesh.C             |   2 +-
 .../extendedEdgeMesh/extendedEdgeMesh.C       |   8 +-
 .../mappedPolyPatch/mappedPatchBaseI.H        |   4 +-
 src/meshTools/meshSearch/meshSearch.C         |   4 +-
 .../regionCoupledBaseGAMGInterface.H          |   2 +-
 .../regionCoupledBase.C                       |   2 +-
 src/meshTools/regionSplit/regionSplit.H       |   2 +-
 .../searchableSurface/searchableSurface.H     |   2 +-
 .../triSurfaceMesh/triSurfaceMesh.C           |   3 +-
 .../sets/topoSetSource/topoSetSource.H        |   2 +-
 src/meshTools/sets/topoSets/topoSet.H         |   2 +-
 .../triSurfaceSearch/triSurfaceSearch.C       |   2 +-
 .../dynamicOversetFvMesh.C                    |   4 +-
 .../oversetPolyPatch/oversetGAMGInterface.H   |   2 +-
 .../decompose/decompose/decompositionModel.H  |   2 +-
 .../distributedTriSurfaceMesh.C               |   2 +-
 .../pyrolysisModel/pyrolysisModel.H           |   2 +-
 .../regionModel/regionModel/regionModelI.H    |   8 +-
 .../regionModel1D/regionModel1DI.H            |   2 +-
 .../singleLayerRegion/singleLayerRegion.C     |   4 +-
 ...linedFilmNusseltHeightFvPatchScalarField.C |  18 +-
 ...lmNusseltInletVelocityFvPatchVectorField.C |  18 +-
 .../kinematicSingleLayerI.H                   |   4 +-
 .../thermoSingleLayer/thermoSingleLayerI.H    |   8 +-
 .../thermalBaffle/thermalBaffle.C             |   2 +-
 .../bodies/compositeBody/compositeBodyI.H     |   2 +-
 .../bodies/subBody/subBodyI.H                 |   2 +-
 .../joints/floating/floatingJoint.C           |  13 +-
 .../joints/floating/floatingJoint.H           |   4 +-
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C |   2 +-
 .../sampledSet/sampledSet/sampledSet.H        |   2 +-
 .../distanceSurface/distanceSurface.H         |   8 +-
 .../isoSurface/sampledIsoSurface.H            |   2 +-
 .../sampledCuttingPlane/sampledCuttingPlane.H |   2 +-
 .../sampledSurface/sampledSurface.H           |   2 +-
 .../sampledTriSurfaceMesh.C                   |   2 +-
 .../surfMeshSampler/surfMeshSampler.H         |   2 +-
 .../surface/triSurfaceMesh/discreteSurface.C  |   2 +-
 .../sixDoFRigidBodyMotion.C                   |   6 +-
 .../sixDoFRigidBodyMotion.H                   |   4 +-
 .../sixDoFRigidBodyState.C                    |   7 -
 .../sixDoFRigidBodyState.H                    |   2 +-
 src/surfMesh/surfZone/surfZone/surfZone.H     |   2 +-
 .../SLGThermo/SLGThermo/SLGThermo.C           |   4 +-
 .../psiChemistryModel/psiChemistryModelI.H    |   4 +-
 .../rhoChemistryModel/rhoChemistryModelI.H    |   4 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C       |   6 +-
 .../radiationModel/radiationModel.C           |   6 +-
 .../boundaryRadiationPropertiesPatch.C        |   4 +-
 .../solarCalculator/solarCalculator.H         |   2 +-
 .../basicSolidChemistryModelI.H               |   4 +-
 .../thermophysicalPropertiesSelectorI.H       |   2 +-
 ...emperatureCoupledMixedFvPatchScalarField.C |   4 +-
 .../mixerFvMesh/mixerFvMesh.H                 |   2 +-
 .../incompressibleTwoPhaseMixture.H           |   4 +-
 ...ndentAlphaContactAngleFvPatchScalarField.C |   6 +-
 308 files changed, 1613 insertions(+), 1388 deletions(-)
 create mode 100644 applications/test/autoPtr/Make/files
 create mode 100644 applications/test/autoPtr/Make/options
 create mode 100644 applications/test/autoPtr/Test-autoPtr.C

diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index 84155c4849..c0602016c8 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -165,7 +165,7 @@ IOdictionary PDRProperties
 autoPtr<PDRDragModel> drag = PDRDragModel::New
 (
     PDRProperties,
-    turbulence,
+    *turbulence,
     rho,
     U,
     phi
@@ -176,7 +176,7 @@ autoPtr<XiModel> flameWrinkling = XiModel::New
 (
     PDRProperties,
     thermo,
-    turbulence,
+    *turbulence,
     Su,
     rho,
     b,
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
index aefdbdee4f..b84ce6a7fa 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
@@ -89,22 +89,22 @@ public:
 
         const rhoThermo& thermo1() const
         {
-            return thermo1_();
+            return *thermo1_;
         }
 
         const rhoThermo& thermo2() const
         {
-            return thermo2_();
+            return *thermo2_;
         }
 
         rhoThermo& thermo1()
         {
-            return thermo1_();
+            return *thermo1_;
         }
 
         rhoThermo& thermo2()
         {
-            return thermo2_();
+            return *thermo2_;
         }
 
         //- Correct the thermodynamics of each phase
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
index c97a5a1382..007b8206ae 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
@@ -81,7 +81,7 @@ Foam::phaseModel::phaseModel
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
     NotImplemented;
-    return autoPtr<phaseModel>(nullptr);
+    return autoPtr<phaseModel>();
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
index 66d0ac8d63..44310e4df3 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
@@ -120,13 +120,13 @@ public:
         //- Return const-access to phase rhoThermo
         const rhoThermo& thermo() const
         {
-            return thermo_();
+            return *thermo_;
         }
 
         //- Return access to phase rhoThermo
         rhoThermo& thermo()
         {
-            return thermo_();
+            return *thermo_;
         }
 
         //- Return const-access to phase divergence
diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H
index 0950bbaba0..d790264fef 100644
--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H
@@ -106,13 +106,13 @@ public:
         //- Return const-access to the mixture viscosityModel
         const mixtureViscosityModel& muModel() const
         {
-            return muModel_();
+            return *muModel_;
         }
 
         //- Return const-access to the continuous-phase viscosityModel
         const viscosityModel& nucModel() const
         {
-            return nucModel_();
+            return *nucModel_;
         }
 
         //- Return const-access to the dispersed-phase density
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
index 58341e6cad..393c388d9f 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
@@ -181,19 +181,19 @@ public:
         //- Return const-access to phase1 viscosityModel
         const viscosityModel& nuModel1() const
         {
-            return nuModel1_();
+            return *nuModel1_;
         }
 
         //- Return const-access to phase2 viscosityModel
         const viscosityModel& nuModel2() const
         {
-            return nuModel2_();
+            return *nuModel2_;
         }
 
         //- Return const-access to phase3 viscosityModel
         const viscosityModel& nuModel3() const
         {
-            return nuModel3_();
+            return *nuModel3_;
         }
 
         //- Return the dynamic laminar viscosity
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 224d0345d6..b57058d61f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -205,7 +205,7 @@ Foam::phaseModel::~phaseModel()
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
     NotImplemented;
-    return autoPtr<phaseModel>(nullptr);
+    return autoPtr<phaseModel>();
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
index 90e48183ca..3740878610 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
@@ -190,12 +190,12 @@ public:
 
         const surfaceScalarField& phi() const
         {
-            return phiPtr_();
+            return *phiPtr_;
         }
 
         surfaceScalarField& phi()
         {
-            return phiPtr_();
+            return *phiPtr_;
         }
 
         const surfaceScalarField& alphaPhi() const
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
index 5fc59061a4..e14906619b 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
@@ -68,7 +68,7 @@ Foam::phase::phase
 Foam::autoPtr<Foam::phase> Foam::phase::clone() const
 {
     NotImplemented;
-    return autoPtr<phase>(nullptr);
+    return autoPtr<phase>();
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
index 91341fcf5c..3ce0ba7d65 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
@@ -120,7 +120,7 @@ public:
         //- Return const-access to phase1 viscosityModel
         const viscosityModel& nuModel() const
         {
-            return nuModel_();
+            return *nuModel_;
         }
 
         //- Return the kinematic laminar viscosity
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index c63f6bfd44..bb493847b0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -59,14 +59,9 @@ HeatAndMassTransferPhaseSystem
         massTransferModels_
     );
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -197,14 +192,9 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
         )
     );
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -239,14 +229,9 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
     phaseSystem::momentumTransferTable& eqns = eqnsPtr();
 
     // Source term due to mass trasfer
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -291,17 +276,10 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
     }
 
     // Heat transfer with the interface
-    forAllConstIter
-    (
-        heatTransferModelTable,
-        heatTransferModels_,
-        heatTransferModelIter
-    )
+    forAllConstIters(heatTransferModels_, heatTransferModelIter)
     {
-        const phasePair& pair
-        (
-            this->phasePairs_[heatTransferModelIter.key()]
-        );
+        const phasePair& pair =
+            *(this->phasePairs_[heatTransferModelIter.key()]);
 
         const phaseModel* phase = &pair.phase1();
         const phaseModel* otherPhase = &pair.phase2();
@@ -344,14 +322,9 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
     }
 
     // Source term due to mass transfer
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 9fee19e77f..465d0b3af9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -128,16 +128,12 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
         );
     }
 
-    forAllConstIter
-    (
-        heatTransferModelTable,
-        heatTransferModels_,
-        heatTransferModelIter
-    )
+    forAllConstIters(heatTransferModels_, heatTransferModelIter)
     {
-        const volScalarField K(heatTransferModelIter()->K());
+        const phasePair& pair =
+            *(this->phasePairs_[heatTransferModelIter.key()]);
 
-        const phasePair& pair(this->phasePairs_[heatTransferModelIter.key()]);
+        const volScalarField K(heatTransferModelIter()->K());
 
         const phaseModel* phase = &pair.phase1();
         const phaseModel* otherPhase = &pair.phase2();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
index 1c9b53c803..53f724680b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
@@ -86,14 +86,9 @@ massTransfer() const
     }
 
     // Reset the interfacial mass flow rates
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -108,22 +103,18 @@ massTransfer() const
     }
 
     // Sum up the contribution from each interface composition model
-    forAllConstIter
+    forAllConstIters
     (
-        interfaceCompositionModelTable,
         interfaceCompositionModels_,
         interfaceCompositionModelIter
     )
     {
-        const interfaceCompositionModel& compositionModel
-        (
-            interfaceCompositionModelIter()
-        );
+        const phasePair& pair =
+            *(this->phasePairs_[interfaceCompositionModelIter.key()]);
+
+        const interfaceCompositionModel& compositionModel =
+            *(interfaceCompositionModelIter.object());
 
-        const phasePair& pair
-        (
-            this->phasePairs_[interfaceCompositionModelIter.key()]
-        );
         const phaseModel& phase = pair.phase1();
         const phaseModel& otherPhase = pair.phase2();
         const phasePairKey key(phase.name(), otherPhase.name());
@@ -209,14 +200,9 @@ correctThermo()
     // Yfi is likely to be a strong non-linear (typically exponential) function
     // of Tf, so the solution for the temperature is newton-accelerated
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 02969b89cb..43d5881fed 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -82,14 +82,10 @@ MomentumTransferPhaseSystem
         turbulentDispersionModels_
     );
 
-    forAllConstIter
-    (
-        dragModelTable,
-        dragModels_,
-        dragModelIter
-    )
+    forAllConstIters(dragModels_, dragModelIter)
     {
-        const phasePair& pair(this->phasePairs_[dragModelIter.key()]);
+        const phasePair& pair =
+            *(this->phasePairs_[dragModelIter.key()]);
 
         Kds_.insert
         (
@@ -102,14 +98,10 @@ MomentumTransferPhaseSystem
         );
     }
 
-    forAllConstIter
-    (
-        virtualMassModelTable,
-        virtualMassModels_,
-        virtualMassModelIter
-    )
+    forAllConstIters(virtualMassModels_, virtualMassModelIter)
     {
-        const phasePair& pair(this->phasePairs_[virtualMassModelIter.key()]);
+        const phasePair& pair =
+            *(this->phasePairs_[virtualMassModelIter.key()]);
 
         Vms_.insert
         (
@@ -183,16 +175,11 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
         )
     );
 
-    forAllConstIter
-    (
-        phaseSystem::KdTable,
-        Kds_,
-        KdIter
-    )
+    forAllConstIters(Kds_, KdIter)
     {
-        const volScalarField& K(*KdIter());
+        const phasePair& pair = *(this->phasePairs_[KdIter.key()]);
 
-        const phasePair& pair(this->phasePairs_[KdIter.key()]);
+        const volScalarField& K(*KdIter());
 
         const phaseModel* phase1 = &pair.phase1();
         const phaseModel* phase2 = &pair.phase2();
@@ -430,27 +417,17 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
     }
 
     // Update the drag coefficients
-    forAllConstIter
-    (
-        dragModelTable,
-        dragModels_,
-        dragModelIter
-    )
+    forAllConstIters(dragModels_, dragModelIter)
     {
         *Kds_[dragModelIter.key()] = dragModelIter()->K();
     }
 
     // Add the implicit part of the drag force
-    forAllConstIter
-    (
-        phaseSystem::KdTable,
-        Kds_,
-        KdIter
-    )
+    forAllConstIters(Kds_, KdIter)
     {
-        const volScalarField& K(*KdIter());
+        const phasePair& pair = *(this->phasePairs_[KdIter.key()]);
 
-        const phasePair& pair(this->phasePairs_[KdIter.key()]);
+        const volScalarField& K(*KdIter());
 
         const phaseModel* phase = &pair.phase1();
         const phaseModel* otherPhase = &pair.phase2();
@@ -466,27 +443,17 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
     }
 
     // Update the virtual mass coefficients
-    forAllConstIter
-    (
-        virtualMassModelTable,
-        virtualMassModels_,
-        virtualMassModelIter
-    )
+    forAllConstIters(virtualMassModels_, virtualMassModelIter)
     {
         *Vms_[virtualMassModelIter.key()] = virtualMassModelIter()->K();
     }
 
     // Add the virtual mass force
-    forAllConstIter
-    (
-        phaseSystem::VmTable,
-        Vms_,
-        VmIter
-    )
+    forAllConstIters(Vms_, VmIter)
     {
-        const volScalarField& Vm(*VmIter());
+        const phasePair& pair = *(this->phasePairs_[VmIter.key()]);
 
-        const phasePair& pair(this->phasePairs_[VmIter.key()]);
+        const volScalarField& Vm(*VmIter());
 
         const phaseModel* phase = &pair.phase1();
         const phaseModel* otherPhase = &pair.phase2();
@@ -557,33 +524,22 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
     PtrList<volVectorField>& Fs = tFs();
 
     // Add the lift force
-    forAllConstIter
-    (
-        liftModelTable,
-        liftModels_,
-        liftModelIter
-    )
+    forAllConstIters(liftModels_, modelIter)
     {
-        const volVectorField F(liftModelIter()->F<vector>());
+        const phasePair& pair = *(this->phasePairs_[modelIter.key()]);
 
-        const phasePair& pair(this->phasePairs_[liftModelIter.key()]);
+        const volVectorField F(modelIter()->template F<vector>());
 
         setF(Fs, pair.phase1().index()) += F;
         setF(Fs, pair.phase2().index()) -= F;
     }
 
     // Add the wall lubrication force
-    forAllConstIter
-    (
-        wallLubricationModelTable,
-        wallLubricationModels_,
-        wallLubricationModelIter
-    )
+    forAllConstIters(wallLubricationModels_, modelIter)
     {
-        const volVectorField F(wallLubricationModelIter()->F<vector>());
+        const phasePair& pair = *(this->phasePairs_[modelIter.key()]);
 
-        const phasePair&
-            pair(this->phasePairs_[wallLubricationModelIter.key()]);
+        const volVectorField F(modelIter()->template F<vector>());
 
         setF(Fs, pair.phase1().index()) += F;
         setF(Fs, pair.phase2().index()) -= F;
@@ -647,15 +603,10 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
     PtrList<surfaceScalarField>& phiDs = tphiDs();
 
     // Add the turbulent dispersion force
-    forAllConstIter
-    (
-        turbulentDispersionModelTable,
-        turbulentDispersionModels_,
-        turbulentDispersionModelIter
-    )
+    forAllConstIters(turbulentDispersionModels_, turbulentDispersionModelIter)
     {
-        const phasePair&
-            pair(this->phasePairs_[turbulentDispersionModelIter.key()]);
+        const phasePair& pair =
+            *(this->phasePairs_[turbulentDispersionModelIter.key()]);
 
         const volScalarField D(turbulentDispersionModelIter()->D());
         const surfaceScalarField snGradAlpha1
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index a6dd838d23..bb5c2462c3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -42,14 +42,9 @@ ThermalPhaseChangePhaseSystem
     massTransfer_(this->lookup("massTransfer"))
 {
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -92,7 +87,7 @@ template<class BasePhaseSystem>
 const Foam::saturationModel&
 Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::saturation() const
 {
-    return saturationModel_();
+    return *saturationModel_;
 }
 
 
@@ -109,14 +104,9 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
     phaseSystem::heatTransferTable& eqns = eqnsPtr();
 
     // Accumulate mDotL contributions from boundaries
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -219,19 +209,15 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
         }
     }
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
             continue;
         }
+
         const phaseModel& phase = pair.phase1();
         const phaseModel& otherPhase = pair.phase2();
 
@@ -292,14 +278,9 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
         )
     );
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
@@ -332,14 +313,9 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 
     BasePhaseSystem::correctThermo();
 
-    forAllConstIter
-    (
-        phaseSystem::phasePairTable,
-        this->phasePairs_,
-        phasePairIter
-    )
+    forAllConstIters(this->phasePairs_, phasePairIter)
     {
-        const phasePair& pair(phasePairIter());
+        const phasePair& pair = *(phasePairIter.object());
 
         if (pair.ordered())
         {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 2afa388aca..460e21ce85 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -401,7 +401,7 @@ template<class BasePhaseModel>
 const Foam::phaseCompressibleTurbulenceModel&
 Foam::MovingPhaseModel<BasePhaseModel>::turbulence() const
 {
-    return turbulence_;
+    return *turbulence_;
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index da10824230..26be4e1bc7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -77,7 +77,7 @@ Foam::phaseModel::phaseModel
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
     NotImplemented;
-    return autoPtr<phaseModel>(nullptr);
+    return autoPtr<phaseModel>();
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index 8f4bf7ee0f..768c905e1f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
@@ -48,8 +48,8 @@ void Foam::phaseSystem::createSubModels
             key,
             modelType::New
             (
-               *iter,
-                phasePairs_[key]
+                iter.object(),
+                phasePairs_[key]()
             )
         );
     }
@@ -98,11 +98,11 @@ void Foam::phaseSystem::generatePairsAndSubModels
     const blendingMethod& blending
     (
         blendingMethods_.found(modelName)
-      ? blendingMethods_[modelName]
-      : blendingMethods_["default"]
+      ? *(blendingMethods_[modelName])
+      : *(blendingMethods_["default"])
     );
 
-    autoPtr<modelType> noModel(nullptr);
+    autoPtr<modelType> noModel;
 
     forAllConstIter(typename modelTypeTable, tempModels, iter)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index a164b73f26..758c411968 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -217,16 +217,11 @@ while (pimple.correct())
             )
         );
 
-        forAllConstIter
-        (
-            phaseSystem::KdTable,
-            fluid.Kds(),
-            KdIter
-        )
+        forAllConstIters(fluid.Kds(), KdIter)
         {
             const volScalarField& K(*KdIter());
 
-            const phasePair& pair(fluid.phasePairs()[KdIter.key()]);
+            const phasePair& pair = *(fluid.phasePairs()[KdIter.key()]);
 
             const phaseModel* phase1 = &pair.phase1();
             const phaseModel* phase2 = &pair.phase2();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index 3183796015..db917c4865 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -115,7 +115,7 @@ public:
         autoPtr<IATEsource> clone() const
         {
             NotImplemented;
-            return autoPtr<IATEsource>(nullptr);
+            return autoPtr<IATEsource>();
         }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index cc089e347e..289054982d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -451,9 +451,11 @@ bool Foam::BlendedInterfacialModel<modelType>::hasModel
 ) const
 {
     return
-       &phase == &(pair_.phase1())
+    (
+        &phase == &(pair_.phase1())
       ? model1In2_.valid()
-      : model2In1_.valid();
+      : model2In1_.valid()
+    );
 }
 
 
@@ -463,7 +465,7 @@ const modelType& Foam::BlendedInterfacialModel<modelType>::phaseModel
     const class phaseModel& phase
 ) const
 {
-    return &phase == &(pair_.phase1()) ? model1In2_ : model2In1_;
+    return &phase == &(pair_.phase1()) ? *model1In2_ : *model2In1_;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index c7655b9c34..29c150ce74 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -114,7 +114,7 @@ public:
         autoPtr<IATEsource> clone() const
         {
             NotImplemented;
-            return autoPtr<IATEsource>(nullptr);
+            return autoPtr<IATEsource>();
         }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
index 9352b72397..139826e885 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
@@ -227,14 +227,14 @@ Foam::tmp<Foam::volScalarField> Foam::phaseModel::d() const
 Foam::PhaseCompressibleTurbulenceModel<Foam::phaseModel>&
 Foam::phaseModel::turbulence()
 {
-    return turbulence_();
+    return *turbulence_;
 }
 
 
 const Foam::PhaseCompressibleTurbulenceModel<Foam::phaseModel>&
 Foam::phaseModel::turbulence() const
 {
-    return turbulence_();
+    return *turbulence_;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
index 894907fe7c..f0c88afa1e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
@@ -162,14 +162,14 @@ public:
         //- Return the thermophysical model
         const rhoThermo& thermo() const
         {
-            return thermo_();
+            return *thermo_;
         }
 
         //- Return non-const access to the thermophysical model
         //  for correction
         rhoThermo& thermo()
         {
-            return thermo_();
+            return *thermo_;
         }
 
         //- Return the laminar viscosity
@@ -286,13 +286,13 @@ public:
         //- Return the volumetric flux
         const surfaceScalarField& phi() const
         {
-            return phiPtr_();
+            return *phiPtr_;
         }
 
         //- Return non-const access to the volumetric flux
         surfaceScalarField& phi()
         {
-            return phiPtr_();
+            return *phiPtr_;
         }
 
         //- Return the volumetric flux of the phase
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 5a99c32ae2..4750293fe8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -177,12 +177,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("drag"),
             (
                 blendingMethods_.found("drag")
-              ? blendingMethods_["drag"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["drag"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_,
+            *pair_,
+            *pair1In2_,
+            *pair2In1_,
             false // Do not zero drag coefficent at fixed-flux BCs
         )
     );
@@ -194,12 +194,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("virtualMass"),
             (
                 blendingMethods_.found("virtualMass")
-              ? blendingMethods_["virtualMass"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["virtualMass"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_
+            *pair_,
+            *pair1In2_,
+            *pair2In1_
         )
     );
 
@@ -210,12 +210,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("heatTransfer"),
             (
                 blendingMethods_.found("heatTransfer")
-              ? blendingMethods_["heatTransfer"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["heatTransfer"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_
+            *pair_,
+            *pair1In2_,
+            *pair2In1_
         )
     );
 
@@ -226,12 +226,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("lift"),
             (
                 blendingMethods_.found("lift")
-              ? blendingMethods_["lift"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["lift"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_
+            *pair_,
+            *pair1In2_,
+            *pair2In1_
         )
     );
 
@@ -242,12 +242,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("wallLubrication"),
             (
                 blendingMethods_.found("wallLubrication")
-              ? blendingMethods_["wallLubrication"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["wallLubrication"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_
+            *pair_,
+            *pair1In2_,
+            *pair2In1_
         )
     );
 
@@ -258,12 +258,12 @@ Foam::twoPhaseSystem::twoPhaseSystem
             lookup("turbulentDispersion"),
             (
                 blendingMethods_.found("turbulentDispersion")
-              ? blendingMethods_["turbulentDispersion"]
-              : blendingMethods_["default"]
+              ? *(blendingMethods_["turbulentDispersion"])
+              : *(blendingMethods_["default"])
             ),
-            pair_,
-            pair1In2_,
-            pair2In1_
+            *pair_,
+            *pair1In2_,
+            *pair2In1_
         )
     );
 }
@@ -272,7 +272,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::twoPhaseSystem::~twoPhaseSystem()
-{}
+{} // Define here (incomplete type in header)
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
index fd97d416f9..8d9ef025c8 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
@@ -16,7 +16,7 @@ volVectorField D
 );
 
 
-autoPtr<volScalarField> Tptr(nullptr);
+autoPtr<volScalarField> Tptr;
 
 if (thermalStress)
 {
diff --git a/applications/test/autoPtr/Make/files b/applications/test/autoPtr/Make/files
new file mode 100644
index 0000000000..a89ae35418
--- /dev/null
+++ b/applications/test/autoPtr/Make/files
@@ -0,0 +1,3 @@
+Test-autoPtr.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-autoPtr
diff --git a/applications/test/autoPtr/Make/options b/applications/test/autoPtr/Make/options
new file mode 100644
index 0000000000..3ed9829402
--- /dev/null
+++ b/applications/test/autoPtr/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+
+EXE_LIBS = \
+    -lthermophysicalProperties
diff --git a/applications/test/autoPtr/Test-autoPtr.C b/applications/test/autoPtr/Test-autoPtr.C
new file mode 100644
index 0000000000..edd7f222e8
--- /dev/null
+++ b/applications/test/autoPtr/Test-autoPtr.C
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "autoPtr.H"
+#include "labelList.H"
+#include "ListOps.H"
+#include "IOstreams.H"
+#include "Switch.H"
+
+#include "C7H16.H"
+
+using namespace Foam;
+
+
+// An example of bad use, since our autoPtr is too generous when being passed
+// around
+void testTransfer1(autoPtr<labelList> ap)
+{
+    // Passed in copy, so automatically removes content
+    // Transfer would be nice, but not actually needed
+
+    Info<< "recv " << Switch(ap.valid()).c_str() << nl;
+}
+
+
+// An example of good use. We are allowed to manage the memory (or not)
+// and not automatically start losing things.
+void testTransfer2(autoPtr<labelList>&& ap)
+{
+    // As rvalue, so this time we actually get to manage content
+    Info<< "recv " << Switch(ap.valid()).c_str() << nl;
+}
+
+
+// Constructor from literal nullptr is implicit
+template<class T>
+autoPtr<T> testNullReturn1()
+{
+    return nullptr;
+}
+
+
+// Constructor from raw pointer is explicit
+template<class T>
+autoPtr<T> testNullReturn2()
+{
+    T* p = new T;
+
+    return p;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    {
+        auto list = autoPtr<labelList>::New(10, label(-1));
+
+        Info<<"create: " << list() << nl;
+
+        Info<<"create: " << autoPtr<labelList>::New(10, label(-1))()
+            << nl << nl;
+    }
+
+    // Confirm that forwarding with move construct actually works as expected
+    {
+        auto source = identity(8);
+        Info<<"move construct from "
+            << flatOutput(source) << " @ " << long(source.cdata())
+            << nl << nl;
+
+        auto list = autoPtr<labelList>::New(std::move(source));
+
+        Info<<"created: " << flatOutput(*list) << " @ " << long(list->cdata())
+            << nl << nl;
+
+        Info<<"orig: "
+            << flatOutput(source) << " @ " << long(source.cdata())
+            << nl << nl;
+    }
+
+    // Explicit construct Base from Derived
+    {
+        autoPtr<liquidProperties> liqProp
+        (
+            autoPtr<C7H16>::New()
+        );
+
+        Info<<"liq 1: " << liqProp() << nl << nl;
+    }
+
+    // Construct Base from Derived
+    {
+        autoPtr<liquidProperties> liqProp =
+            autoPtr<liquidProperties>::NewFrom<C7H16>();
+
+        Info<<"liq 2: " << liqProp() << nl << nl;
+    }
+
+    // Construct Base from Derived
+    {
+        const autoPtr<liquidProperties> liqProp(autoPtr<C7H16>::New());
+
+        Info<<"liq: " << liqProp() << nl << nl;
+        Info<<"liq-type: " << liqProp->type() << nl << nl;
+        Info<<"type: " << typeid(liqProp.get()).name() << nl;
+    }
+
+    // Memory transfer
+    {
+        Info<< nl << nl;
+
+        auto list = autoPtr<labelList>::New(identity(8));
+        Info<<"forward to function from "
+            << flatOutput(*list) << " @ " << long(list->cdata())
+            << nl << nl;
+
+        testTransfer2(std::move(list));
+
+        Info<<"now have valid=" << Switch(list.valid()).c_str();
+
+        if (list.valid())
+        {
+            Info<< nl
+                << flatOutput(*list) << " @ " << long(list->cdata())
+                << nl;
+        }
+        else
+        {
+            Info<< nl;
+        }
+    }
+
+    // Memory transfer
+    {
+        Info<< nl << nl;
+
+        testTransfer2(autoPtr<labelList>::New(identity(8)));
+    }
+
+    // Memory transfer
+    {
+        Info<< nl << nl;
+
+        auto list = autoPtr<labelList>::New(identity(8));
+        Info<<"forward to function from "
+            << flatOutput(*list) << " @ " << long(list->cdata())
+            << nl << nl;
+
+        testTransfer2(std::move(list));
+
+        Info<<"now have valid=" << Switch(list.valid()).c_str();
+
+        if (list.valid())
+        {
+            Info<< nl
+                << flatOutput(*list) << " @ " << long(list->cdata())
+                << nl;
+        }
+        else
+        {
+            Info<< nl;
+        }
+    }
+
+
+    // Memory transfer
+    {
+        auto ptr1 = autoPtr<labelList>::New();
+        auto ptr2 = autoPtr<labelList>::New();
+
+        Info<<"ptr valid: " << ptr1.valid() << nl;
+
+        // Refuses to compile (good!):   ptr1 = new labelList(10);
+
+        // Does compile (good!):   ptr1 = nullptr;
+
+        ptr1.reset(std::move(ptr2));
+    }
+
+
+    {
+        // Good this work:
+        autoPtr<labelList> ptr1 = testNullReturn1<labelList>();
+
+        // Good this does not compile:
+        // autoPtr<labelList> ptr2 = testNullReturn2<labelList>();
+    }
+
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index a641819d7e..0ca3052e4c 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, inflate);
 
         Info<< "Mapping fields" << nl << endl;
-        mesh.updateMesh(morphMap);
+        mesh.updateMesh(morphMap());
 
         // Move mesh (since morphing does not do this)
         if (morphMap().hasMotionPoints())
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
         }
 
         // Update numbering of cells/vertices.
-        faceRemover.updateMesh(morphMap);
+        faceRemover.updateMesh(morphMap());
 
 
         Info<< "Writing fields" << nl << endl;
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 66a55fbafc..d34ff23c42 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
 
             // Update fields
             Info<< nl << "-- mapping mesh data" << endl;
-            mesh.updateMesh(map);
+            mesh.updateMesh(map());
 
             // Inflate mesh
             if (map().hasMotionPoints())
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
 
             // Update numbering of cells/vertices.
             Info<< nl << "-- mapping hexRef8 data" << endl;
-            meshCutter.updateMesh(map);
+            meshCutter.updateMesh(map());
         }
 
 
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index f6bac7844a..6bd47c6bf7 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -1155,7 +1155,9 @@ int main(int argc, char *argv[])
     }
 
     // Change the mesh. Change points directly (no inflation).
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(subsetter.subMesh(), false);
+    autoPtr<mapPolyMesh> mapPtr =
+        meshMod.changeMesh(subsetter.subMesh(), false);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields
     subsetter.subMesh().updateMesh(map);
@@ -1231,9 +1233,9 @@ int main(int argc, char *argv[])
 
 
     // Move mesh (since morphing might not do this)
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        subsetter.subMesh().movePoints(map().preMotionPoints());
+        subsetter.subMesh().movePoints(map.preMotionPoints());
     }
 
     Info<< "Writing mesh with split blockedFaces to time " << runTime.value()
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index fa307d05e6..f4d889d28a 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
                 polyMeshFilter::copySets(newMesh(), mesh);
             }
 
-            pointPriority = meshFilter.pointPriority();
+            pointPriority = *(meshFilter.pointPriority());
         }
 
         if (collapseFaceSet)
@@ -203,14 +203,14 @@ int main(int argc, char *argv[])
             // from the previous edge filtering to use as a stopping criterion.
             meshFilter.filter(indirectPatchFaces);
             {
-                polyTopoChange meshMod(newMesh);
+                polyTopoChange meshMod(newMesh());
 
                 meshMod.changeMesh(mesh, false);
 
                 polyMeshFilter::copySets(newMesh(), mesh);
             }
 
-            pointPriority = meshFilter.pointPriority();
+            pointPriority = *(meshFilter.pointPriority());
         }
 
         if (collapseFaces)
@@ -227,14 +227,14 @@ int main(int argc, char *argv[])
             // from the previous edge filtering to use as a stopping criterion.
             meshFilter.filter(nBadFaces);
             {
-                polyTopoChange meshMod(newMesh);
+                polyTopoChange meshMod(newMesh());
 
                 meshMod.changeMesh(mesh, false);
 
                 polyMeshFilter::copySets(newMesh(), mesh);
             }
 
-            pointPriority = meshFilter.pointPriority();
+            pointPriority = *(meshFilter.pointPriority());
         }
 
         // Write resulting mesh
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index f1e3218540..3423d69865 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -113,7 +113,7 @@ label mergePatchFaces
             map = meshMod.changeMesh(mesh, false, true);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.updateMesh(map());
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -269,7 +269,7 @@ label mergePatchFaces
             map = meshMod.changeMesh(mesh, false, true);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.updateMesh(map());
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -322,7 +322,7 @@ label mergeEdges(const scalar minCos, polyMesh& mesh)
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.updateMesh(map());
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 5b123d64e2..6901fcd8da 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -174,10 +174,10 @@ int main(int argc, char *argv[])
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.updateMesh(map());
 
     // Update numbering of cells/vertices.
-    meshCutter.updateMesh(map);
+    meshCutter.updateMesh(map());
 
     // Optionally inflate mesh
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 2578a37e9b..bb78ffc827 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -155,18 +155,18 @@ int main(int argc, char *argv[])
         meshMod
     );
 
-    autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, false);
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
-    mesh.updateMesh(morphMap);
+    mesh.updateMesh(map());
 
     // Move mesh (since morphing does not do this)
-    if (morphMap().hasMotionPoints())
+    if (map().hasMotionPoints())
     {
-        mesh.movePoints(morphMap().preMotionPoints());
+        mesh.movePoints(map().preMotionPoints());
     }
 
     // Update numbering of cells/vertices.
-    faceRemover.updateMesh(morphMap);
+    faceRemover.updateMesh(map());
 
     if (!overwrite)
     {
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index 8b4b2dcaf2..fef71bbd87 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -416,20 +416,14 @@ int main(int argc, char *argv[])
     );
 
 
-    // Surface
-    autoPtr<triSurface> surf(nullptr);
-    // Search engine on surface.
-    autoPtr<triSurfaceSearch> querySurf(nullptr);
-
     if (useSurface)
     {
-        surf.reset(new triSurface(surfName));
+        triSurface surf(surfName);
 
         // Dump some stats
-        surf().writeStats(Info);
+        surf.writeStats(Info);
 
-        // Search engine on surface.
-        querySurf.reset(new triSurfaceSearch(surf));
+        triSurfaceSearch querySurf(surf);
 
         // Set cellType[celli] according to relation to surface
         cutBySurface
diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
index 8596ca8f9c..98fa7d42a9 100644
--- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
+++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
         Info<< nl << "Bounding box size: " << mesh().bounds().span() << nl;
 
         // check number of regions
-        regionSplit rs(mesh);
+        regionSplit rs(mesh());
 
         Info<< "Number of regions: " << rs.nRegions();
         if (rs.nRegions() == 1)
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
                 << "**************************************************" << nl;
         }
         Info<< endl;
-        reader.writeMesh(mesh, format);
+        reader.writeMesh(mesh(), format);
 
         // exportName only has a size when export is in effect
         if (exportName.size())
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index c3ffaf04f0..806ded99fb 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 
 
     autoPtr<polyMesh> mesh = reader.mesh(runTime);
-    reader.writeMesh(mesh, format);
+    reader.writeMesh(mesh(), format);
 
 
     Info<< "\nEnd\n" << endl;
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 6d9295dd93..7d459ec82d 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
             wordList(0)
         )
     );
-    const polyMesh& mesh = meshPtr;
+    const polyMesh& mesh = *meshPtr;
 
 
     if (readFaceFile)
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 9051a84db5..f4bc4c55e8 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -433,7 +433,7 @@ int main(int argc, char *argv[])
             autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.updateMesh(map());
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -788,7 +788,7 @@ int main(int argc, char *argv[])
             (
                 layerExtrude.addedCells
                 (
-                    meshFromMesh,
+                    *meshFromMesh,
                     layerExtrude.layerFaces()
                 )
             );
@@ -937,7 +937,7 @@ int main(int argc, char *argv[])
             autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
             // Update fields
-            mesh.updateMesh(map);
+            mesh.updateMesh(map());
 
             // Update stored data
             updateFaceLabels(map(), frontPatchFaces);
@@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.updateMesh(map());
 
         // Update local data
         updateCellSet(map(), addedCellsSet);
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index db1b8c2480..869d54d80a 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2470,7 +2470,7 @@ int main(int argc, char *argv[])
 
 
     // Update numbering on extruder.
-    extruder.updateMesh(shellMap);
+    extruder.updateMesh(shellMap());
 
 
     // Calculate offsets from shell mesh back to original mesh
@@ -2818,7 +2818,7 @@ int main(int argc, char *argv[])
         addBafflesMap = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(addBafflesMap);
+        mesh.updateMesh(addBafflesMap());
 
 
 //XXXXXX
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index d6d87e4c8f..10fda1151c 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
     // Create a mesh from topo changes.
     autoPtr<mapPolyMesh> morphMap = meshMod().changeMesh(mesh(), false);
 
-    mesh().updateMesh(morphMap);
+    mesh().updateMesh(morphMap());
 
     {
         edgeCollapser collapser(mesh());
@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> morphMap
             = meshModCollapse.changeMesh(mesh(), false);
 
-        mesh().updateMesh(morphMap);
+        mesh().updateMesh(morphMap());
     }
 
     if (!overwrite)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 97311eef3c..c053ce9e7b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -142,13 +142,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::DistributedDelaunayMesh
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Triangulation>
-Foam::DistributedDelaunayMesh<Triangulation>::~DistributedDelaunayMesh()
-{}
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Triangulation>
@@ -491,7 +484,8 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 
     const label preDistributionSize = parallelVertices.size();
 
-    mapDistribute pointMap = buildMap(targetProcessor);
+    autoPtr<mapDistribute> pointMapPtr = buildMap(targetProcessor);
+    mapDistribute& pointMap = *pointMapPtr;
 
     // Make a copy of the original list.
     DynamicList<Vb> originalParallelVertices(parallelVertices);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 35b0859b53..07954827b8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -141,7 +141,7 @@ public:
 
 
     //- Destructor
-    ~DistributedDelaunayMesh();
+    ~DistributedDelaunayMesh() = default;
 
 
     // Queries
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 25d9188e01..210d027fe6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -248,10 +248,10 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                 );
 
                 // Update fields
-                mesh_.updateMesh(map);
+                mesh_.updateMesh(map());
 
                 // Update numbering of cells/vertices.
-                meshCutter_.updateMesh(map);
+                meshCutter_.updateMesh(map());
 
                 {
                     // Map volumeStatus
@@ -357,11 +357,11 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                 );
 
                 // Update fields
-                mesh_.updateMesh(map);
+                mesh_.updateMesh(map());
 
                 // Update numbering of cells/vertices.
-                meshCutter_.updateMesh(map);
-                cellRemover.updateMesh(map);
+                meshCutter_.updateMesh(map());
+                cellRemover.updateMesh(map());
 
                 {
                     // Map volumeStatus
@@ -416,7 +416,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                 newDecomp
             );
 
-            meshCutter_.distribute(mapDist);
+            meshCutter_.distribute(mapDist());
 
             mapDist().distributeCellData(volumeStatus);
 
@@ -840,12 +840,6 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::backgroundMeshDecomposition::~backgroundMeshDecomposition()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::mapDistributePolyMesh>
@@ -954,10 +948,10 @@ Foam::backgroundMeshDecomposition::distribute
         );
 
         // Update fields
-        mesh_.updateMesh(map);
+        mesh_.updateMesh(map());
 
         // Update numbering of cells/vertices.
-        meshCutter_.updateMesh(map);
+        meshCutter_.updateMesh(map());
 
         Info<< "    Background mesh refined from "
             << returnReduce(map().nOldCells(), sumOp<label>())
@@ -1000,7 +994,7 @@ Foam::backgroundMeshDecomposition::distribute
 
     autoPtr<mapDistributePolyMesh> mapDist = distributor.distribute(newDecomp);
 
-    meshCutter_.distribute(mapDist);
+    meshCutter_.distribute(mapDist());
 
     if (debug)
     {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index aec8cce0c2..864822e088 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -204,7 +204,7 @@ public:
 
 
     //- Destructor
-    ~backgroundMeshDecomposition();
+    ~backgroundMeshDecomposition() = default;
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index b8dcb5187f..34f25547c0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -34,7 +34,7 @@ const Foam::fvMesh& Foam::backgroundMeshDecomposition::mesh() const
 const Foam::indexedOctree<Foam::treeDataBPatch>&
 Foam::backgroundMeshDecomposition::tree() const
 {
-    return bFTreePtr_();
+    return *bFTreePtr_;
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index cc87adcb70..66759a3ada 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -509,7 +509,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
         if (!distributeBackground(cellSizeMesh))
         {
             // Synchronise the cell size mesh if it has not been distributed
-            cellSizeMesh.distribute(decomposition_);
+            cellSizeMesh.distribute(decomposition_());
         }
     }
 
@@ -531,7 +531,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
 
         if (Pstream::parRun())
         {
-            cellSizeMesh.distribute(decomposition_);
+            cellSizeMesh.distribute(decomposition_());
         }
 
         Info<< "    Iteration " << i
@@ -549,7 +549,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
         // Need to distribute the cell size mesh to cover the background mesh
         if (!distributeBackground(cellSizeMesh))
         {
-            cellSizeMesh.distribute(decomposition_);
+            cellSizeMesh.distribute(decomposition_());
         }
     }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 7f458dbed6..3f6220b526 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -563,7 +563,7 @@ Foam::conformalVoronoiMesh::decomposition() const
             << exit(FatalError) << endl;
     }
 
-    return decomposition_();
+    return *decomposition_;
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index c4fdca83d8..3edd639318 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@@ -132,7 +132,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
             cellWeights
         );
 
-        cellShapeControl_.shapeControlMesh().distribute(decomposition_);
+        cellShapeControl_.shapeControlMesh().distribute(decomposition_());
 
         distribute();
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index 48e45954fb..7ffba4ad14 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -113,10 +113,4 @@ Foam::autoPtr<Foam::initialPointsMethod> Foam::initialPointsMethod::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::initialPointsMethod::~initialPointsMethod()
-{}
-
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
index 276526543b..5c7a940996 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
@@ -156,7 +156,7 @@ public:
 
 
     //- Destructor
-    virtual ~initialPointsMethod();
+    virtual ~initialPointsMethod() = default;
 
 
     // Member Functions
@@ -185,7 +185,7 @@ public:
 
             const backgroundMeshDecomposition& decomposition() const
             {
-                return decomposition_;
+                return *decomposition_;
             }
 
             //- Const access to the details dictionary
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
index 3b7335d620..fe1c509207 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
@@ -101,7 +101,7 @@ public:
         virtual autoPtr<searchableSurfaceFeatures> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceFeatures>(nullptr);
+            return autoPtr<searchableSurfaceFeatures>();
         }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index 39e905bd31..c703564217 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 
             autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(pMesh, false);
 
-            pMesh.updateMesh(morphMap);
+            pMesh.updateMesh(morphMap());
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index e34823f188..b645b090b0 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -544,7 +544,7 @@ Foam::label Foam::checkGeometry
                 nonAlignedPoints.write();
                 if (setWriter.valid())
                 {
-                    mergeAndWrite(setWriter, nonAlignedPoints);
+                    mergeAndWrite(setWriter(), nonAlignedPoints);
                 }
             }
         }
@@ -786,7 +786,7 @@ Foam::label Foam::checkGeometry
                 points.write();
                 if (setWriter.valid())
                 {
-                    mergeAndWrite(setWriter, points);
+                    mergeAndWrite(setWriter(), points);
                 }
             }
         }
@@ -809,7 +809,7 @@ Foam::label Foam::checkGeometry
                 nearPoints.write();
                 if (setWriter.valid())
                 {
-                    mergeAndWrite(setWriter, nearPoints);
+                    mergeAndWrite(setWriter(), nearPoints);
                 }
             }
         }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index a936fb993b..f5e94023f3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -225,7 +225,7 @@ Foam::label Foam::checkTopology
             points.write();
             if (setWriter.valid())
             {
-                mergeAndWrite(setWriter, points);
+                mergeAndWrite(setWriter(), points);
             }
         }
     }
@@ -528,7 +528,7 @@ Foam::label Foam::checkTopology
                 points.write();
                 if (setWriter.valid())
                 {
-                    mergeAndWrite(setWriter, points);
+                    mergeAndWrite(setWriter(), points);
                 }
             }
         }
@@ -639,7 +639,7 @@ Foam::label Foam::checkTopology
         points.write();
         if (setWriter.valid())
         {
-            mergeAndWrite(setWriter, points);
+            mergeAndWrite(setWriter(), points);
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index e7702b69dd..9e3f2ca574 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -824,14 +824,13 @@ int main(int argc, char *argv[])
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
-
+    mesh.updateMesh(map());
 
 
     // Correct boundary faces mapped-out-of-nothing.
     // This is just a hack to correct the value field.
     {
-        fvMeshMapper mapper(mesh, map);
+        fvMeshMapper mapper(mesh, map());
         bool hasWarned = false;
 
         forAllConstIter(wordHashSet, bafflePatches, iter)
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
index 41eb0b6315..b17f016212 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
@@ -109,7 +109,7 @@ public:
         autoPtr<faceSelection> clone() const
         {
             NotImplemented;
-            return autoPtr<faceSelection>(nullptr);
+            return autoPtr<faceSelection>();
         }
 
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
index 10b7f377ed..20e7f66fe5 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
@@ -86,7 +86,7 @@ public:
         autoPtr<faceSelection> clone() const
         {
             NotImplemented;
-            return autoPtr<faceSelection>(nullptr);
+            return autoPtr<faceSelection>();
         }
 
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
index 30262ef8a9..8f934ae3c3 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
@@ -79,7 +79,7 @@ public:
         autoPtr<faceSelection> clone() const
         {
             NotImplemented;
-            return autoPtr<faceSelection>(nullptr);
+            return autoPtr<faceSelection>();
         }
 
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 5fbbae586f..bd0522caa9 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.updateMesh(map());
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
         // Update fields
-        mesh.updateMesh(map);
+        mesh.updateMesh(map());
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 0234ce16d7..bb4cd5d5ad 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -531,7 +531,7 @@ int main(int argc, char *argv[])
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.updateMesh(map());
 
     // Optionally inflate mesh
     if (map().hasMotionPoints())
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index f681501641..6ddc7cda15 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1089,7 +1089,7 @@ int main(int argc, char *argv[])
 
 
     // Update fields
-    mesh.updateMesh(map);
+    mesh.updateMesh(map());
 
     // Update proc maps
     if (cellProcAddressing.headerOk())
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 6141bec908..18f5ab5b34 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -472,7 +472,7 @@ bool doCommand
                         setSource().applyToSet(topoSetSource::NEW, currentSet);
 
                         // Combine new value of currentSet with old one.
-                        currentSet.subset(oldSet);
+                        currentSet.subset(oldSet());
                     }
                     break;
                 }
@@ -814,7 +814,7 @@ int main(int argc, char *argv[])
         // Main command read & execute loop
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        autoPtr<IFstream> fileStreamPtr(nullptr);
+        autoPtr<IFstream> fileStreamPtr;
 
         if (batch)
         {
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index e42eecb04f..1842fd2490 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -257,7 +257,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
 
     if (returnReduce(pointToMaster.size(), sumOp<label>()) == 0)
     {
-        return autoPtr<mapPolyMesh>(nullptr);
+        return autoPtr<mapPolyMesh>();
     }
 
     polyTopoChange meshMod(mesh);
@@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
 
     // Update fields. No inflation, parallel sync.
-    mesh.updateMesh(map);
+    mesh.updateMesh(map());
 
     // pointProcAddressing give indices into the master mesh so adapt them
     // for changed point numbering.
@@ -699,7 +699,7 @@ int main(int argc, char *argv[])
                 (
                     masterMesh[proci],
                     meshToAdd,
-                    couples
+                    couples()
                 );
 
                 // Added processor
@@ -738,7 +738,7 @@ int main(int argc, char *argv[])
                     (
                         masterMesh[proci],
                         masterMesh[next],
-                        couples
+                        couples()
                     );
 
                     // Processors that were already in masterMesh
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 10c3ea80c5..ea1c13be71 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -1810,18 +1810,20 @@ void reconstructLagrangian
             );
         }
         const parLagrangianRedistributor& lagrangianReconstructor =
-            lagrangianReconstructorPtr();
+            *lagrangianReconstructorPtr;
 
         for (const word& cloudName : cloudNames)
         {
             Info<< "Reconstructing lagrangian fields for cloud "
                 << cloudName << nl << endl;
 
-            autoPtr<mapDistributeBase> lagrangianMap =
+            autoPtr<mapDistributeBase> lagrangianMapPtr =
             lagrangianReconstructor.redistributeLagrangianPositions
             (
                 cloudName
             );
+            const mapDistributeBase& lagrangianMap = *lagrangianMapPtr;
+
             IOobjectList sprayObjs
             (
                 mesh,
@@ -2129,8 +2131,9 @@ void redistributeLagrangian
 
         forAll(clouds, i)
         {
-            autoPtr<mapDistributeBase> lagrangianMap =
-            distributor.redistributeLagrangianPositions(clouds[i]);
+            autoPtr<mapDistributeBase> lagrangianMapPtr =
+                distributor.redistributeLagrangianPositions(clouds[i]);
+            const mapDistributeBase& lagrangianMap = *lagrangianMapPtr;
 
             distributor.redistributeStoredLagrangianFields
             <IOField<label>>
@@ -2694,7 +2697,7 @@ int main(int argc, char *argv[])
             (
                 baseMeshPtr(),
                 mesh,
-                distMap,
+                distMap(),
                 Pstream::master()       // do I need to write?
             )
         );
@@ -2778,7 +2781,7 @@ int main(int argc, char *argv[])
                     (
                         baseMeshPtr(),
                         mesh,
-                        distMap,
+                        distMap(),
                         Pstream::master()
                     )
                 );
@@ -2804,7 +2807,7 @@ int main(int argc, char *argv[])
                 lagrangianReconstructorPtr,
                 baseMeshPtr(),
                 mesh,
-                distMap,
+                distMap(),
                 selectedLagrangianFields
             );
 
@@ -3012,7 +3015,7 @@ int main(int argc, char *argv[])
             lagrangianReconstructorPtr,
             mesh,
             nOldCells,
-            distMap,
+            distMap(),
             clouds
         );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloudTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloudTemplates.C
index 04fd865c2c..fb318c062d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloudTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloudTemplates.C
@@ -142,7 +142,7 @@ bool Foam::ensightCloud::writeCloudField
         IOField<Type> field(fieldObject);
         fieldObject.readOpt() = rOpt;
 
-        writeCloudField(field, output.rawRef());
+        writeCloudField(field, output.ref());
     }
 
     return true;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloudTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloudTemplates.C
index 42034d0a1e..060e139b7a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloudTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloudTemplates.C
@@ -83,7 +83,7 @@ bool Foam::ensightSerialCloud::writeCloudField
 )
 {
     IOField<Type> field(fieldObject);
-    return writeCloudField(field, output.rawRef());
+    return writeCloudField(field, output.ref());
 }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index 7722eedbab..f21a8dc5c7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
             if (!optNoMesh)
             {
                 autoPtr<ensightGeoFile> os = ensCase.newGeometry(meshMoving);
-                partsList.write(os.rawRef());
+                partsList.write(os.ref());
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
index 5e6d2fc9c7..bbfbb6e4db 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamVtkLagrangianWriter.H
@@ -127,7 +127,7 @@ public:
 
         inline vtk::formatter& format()
         {
-            return format_();
+            return *format_;
         }
 
         inline label nParcels() const
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index 860d7c2eb9..9c663017f5 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -34,7 +34,7 @@
     const scalar xMin = p->minValue();
     const scalar xMax = p->maxValue();
 
-    autoPtr<OFstream> filePtr(nullptr);
+    autoPtr<OFstream> filePtr;
     if (writeData)
     {
         fileName fName = pdfPath/(p->type() + ".data");
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
index c50c6ebb11..40d23bbb96 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
@@ -76,7 +76,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(nullptr);
+            return autoPtr<searchableSurfaceModifier>();
         }
 
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
index 413e69b935..1024e5e44b 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -100,7 +100,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(nullptr);
+            return autoPtr<searchableSurfaceModifier>();
         }
 
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
index b8329f366c..897bad68a0 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
@@ -96,7 +96,7 @@ public:
         autoPtr<searchableSurfaceModifier> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurfaceModifier>(nullptr);
+            return autoPtr<searchableSurfaceModifier>();
         }
 
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 20475acead..b1909bc78a 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -220,7 +220,7 @@ Foam::dynamicIndexedOctree<Type>::divide
         {
             if (!replaced)
             {
-                contents_[contentI]().transfer(subIndices());
+                contents_[contentI]->transfer(subIndices());
                 nod.subNodes_[octant] = contentPlusOctant(contentI, octant);
 
                 replaced = true;
@@ -239,7 +239,7 @@ Foam::dynamicIndexedOctree<Type>::divide
                     )
                 );
 
-                contents_[sz]().transfer(subIndices());
+                contents_[sz]->transfer(subIndices());
 
                 nod.subNodes_[octant] = contentPlusOctant(sz, octant);
             }
@@ -280,7 +280,7 @@ void Foam::dynamicIndexedOctree<Type>::recursiveSubDivision
 {
     if
     (
-        contents_[contentI]().size() > minSize_
+        contents_[contentI]->size() > minSize_
      && nLevels < maxLevels_
     )
     {
@@ -524,7 +524,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
             {
                 shapes_.findNearest
                 (
-                    contents_[getContent(index)],
+                    *(contents_[getContent(index)]),
                     sample,
 
                     nearestDistSqr,
@@ -589,7 +589,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
             {
                 shapes_.findNearest
                 (
-                    contents_[getContent(index)],
+                    *(contents_[getContent(index)]),
                     ln,
 
                     tightest,
@@ -1341,7 +1341,7 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode
 
     if (isContent(index))
     {
-        const labelList& indices = contents_[getContent(index)];
+        const labelList& indices = *(contents_[getContent(index)]);
 
         if (indices.size())
         {
@@ -1755,7 +1755,7 @@ void Foam::dynamicIndexedOctree<Type>::findBox
 
             if (subBb.overlaps(searchBox))
             {
-                const labelList& indices = contents_[getContent(index)];
+                const labelList& indices = *(contents_[getContent(index)]);
 
                 forAll(indices, i)
                 {
@@ -1803,7 +1803,7 @@ void Foam::dynamicIndexedOctree<Type>::findSphere
 
             if (subBb.overlaps(centre, radiusSqr))
             {
-                const labelList& indices = contents_[getContent(index)];
+                const labelList& indices = *(contents_[getContent(index)]);
 
                 forAll(indices, i)
                 {
@@ -2016,7 +2016,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::countElements
     }
     else if (isContent(index))
     {
-        nElems += contents_[getContent(index)]().size();
+        nElems += contents_[getContent(index)]->size();
     }
     else
     {
@@ -2302,7 +2302,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::findInside
     // Need to check for the presence of content, in-case the node is empty
     if (isContent(contentIndex))
     {
-        labelList indices = contents_[getContent(contentIndex)];
+        const labelList& indices = *(contents_[getContent(contentIndex)]);
 
         forAll(indices, elemI)
         {
@@ -2334,12 +2334,10 @@ const Foam::labelList& Foam::dynamicIndexedOctree<Type>::findIndices
     // Need to check for the presence of content, in-case the node is empty
     if (isContent(contentIndex))
     {
-        return contents_[getContent(contentIndex)];
-    }
-    else
-    {
-        return emptyList<label>();
+        return *(contents_[getContent(contentIndex)]);
     }
+
+    return emptyList<label>();
 }
 
 
@@ -2454,7 +2452,7 @@ bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
             )
         );
 
-        contents_[0]().append(0);
+        contents_[0]->append(0);
 
         // Create topnode.
         node topNode = divide(bb_, 0, -1, 0);
@@ -2518,7 +2516,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
             {
                 const label contentI = getContent(subNodeLabel);
 
-                contents_[contentI]().append(index);
+                contents_[contentI]->append(index);
 
                 recursiveSubDivision
                 (
@@ -2545,7 +2543,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
                     autoPtr<DynamicList<label>>(new DynamicList<label>(1))
                 );
 
-                contents_[sz]().append(index);
+                contents_[sz]->append(index);
 
                 nodes_[nodIndex].subNodes_[octant]
                     = contentPlusOctant(sz, octant);
@@ -2618,7 +2616,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
 
             if (shapes().overlaps(index, subBb))
             {
-                DynamicList<label>& contentList = contents_[contentI]();
+                DynamicList<label>& contentList = *(contents_[contentI]);
 
                 DynamicList<label> newContent(contentList.size());
 
@@ -2644,7 +2642,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
                 contentList.transfer(newContent);
             }
 
-            totalContents += contents_[contentI]().size();
+            totalContents += contents_[contentI]->size();
         }
         else
         {
@@ -2695,7 +2693,7 @@ void Foam::dynamicIndexedOctree<Type>::print
         }
         else if (isContent(index))
         {
-            const labelList& indices = contents_[getContent(index)];
+            const labelList& indices = *(contents_[getContent(index)]);
 
             if (false) //debug)
             {
@@ -2735,7 +2733,7 @@ void Foam::dynamicIndexedOctree<Type>::writeTreeInfo() const
     label nEntries = 0;
     forAll(contents_, i)
     {
-        nEntries += contents_[i]().size();
+        nEntries += contents_[i]->size();
     }
 
     Pout<< "indexedOctree<Type>::indexedOctree"
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index 8017a943fb..c76391fe06 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-typedef DynamicList<autoPtr<DynamicList<label >>> contentListList;
+typedef DynamicList<autoPtr<DynamicList<label>>> contentListList;
 
 // Forward declaration of classes
 template<class Type> class dynamicIndexedOctree;
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index 6d315cd7a6..1604a31e57 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -262,12 +262,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlock
         is.fatalCheck("read(Istream&) : reading entry");
 
         string buf(data.begin(), data.size());
-        realIsPtr = new IStringStream
+        realIsPtr.reset
         (
-            buf,
-            IOstream::ASCII,
-            IOstream::currentVersion,
-            is.name()
+            new IStringStream
+            (
+                buf,
+                IOstream::ASCII,
+                IOstream::currentVersion,
+                is.name()
+            )
         );
 
         // Read header
@@ -314,12 +317,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlock
             is.fatalCheck("read(Istream&) : reading entry");
         }
         string buf(data.begin(), data.size());
-        realIsPtr = new IStringStream
+        realIsPtr.reset
         (
-            buf,
-            IOstream::ASCII,
-            IOstream::currentVersion,
-            is.name()
+            new IStringStream
+            (
+                buf,
+                IOstream::ASCII,
+                IOstream::currentVersion,
+                is.name()
+            )
         );
 
         // Apply master stream settings to realIsPtr
@@ -484,12 +490,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
                 is.fatalCheck("read(Istream&) : reading entry");
 
                 string buf(data.begin(), data.size());
-                realIsPtr = new IStringStream
+                realIsPtr.reset
                 (
-                    buf,
-                    IOstream::ASCII,
-                    IOstream::currentVersion,
-                    fName
+                    new IStringStream
+                    (
+                        buf,
+                        IOstream::ASCII,
+                        IOstream::currentVersion,
+                        fName
+                    )
                 );
 
                 // Read header
@@ -538,12 +547,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
             is >> data;
 
             string buf(data.begin(), data.size());
-            realIsPtr = new IStringStream
+            realIsPtr.reset
             (
-                buf,
-                IOstream::ASCII,
-                IOstream::currentVersion,
-                fName
+                new IStringStream
+                (
+                    buf,
+                    IOstream::ASCII,
+                    IOstream::currentVersion,
+                    fName
+                )
             );
         }
     }
@@ -567,12 +579,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
                 is.fatalCheck("read(Istream&) : reading entry");
 
                 string buf(data.begin(), data.size());
-                realIsPtr = new IStringStream
+                realIsPtr.reset
                 (
-                    buf,
-                    IOstream::ASCII,
-                    IOstream::currentVersion,
-                    fName
+                    new IStringStream
+                    (
+                        buf,
+                        IOstream::ASCII,
+                        IOstream::currentVersion,
+                        fName
+                    )
                 );
 
                 // Read header
@@ -611,12 +626,15 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
             is >> data;
 
             string buf(data.begin(), data.size());
-            realIsPtr = new IStringStream
+            realIsPtr.reset
             (
-                buf,
-                IOstream::ASCII,
-                IOstream::currentVersion,
-                fName
+                new IStringStream
+                (
+                    buf,
+                    IOstream::ASCII,
+                    IOstream::currentVersion,
+                    fName
+                )
             );
         }
     }
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index c082df43cc..dbe34e6aa0 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -48,12 +48,6 @@ void Foam::token::parseError(const char* expected) const
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::token::compound::~compound()
-{}
-
-
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 868019ba3a..ad3c39c402 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -143,9 +143,13 @@ public:
     :
         public refCount
     {
-        // Private data
+        bool empty_;
 
-            bool empty_;
+        //- No default copy construct
+        compound(const compound&) = delete;
+
+        //- No default assign operator
+        compound& operator=(const compound&) = delete;
 
     public:
 
@@ -171,25 +175,22 @@ public:
                 empty_(false)
             {}
 
-            //- No default copy construct
-            compound(const compound&) = delete;
-
 
         // Selectors
 
             //- Select null constructed
             static autoPtr<compound> New(const word& type, Istream& is);
 
+            //- Return true if name is a known (registered) compound type
+            static bool isCompound(const word& name);
+
 
         //- Destructor
-        virtual ~compound();
+        virtual ~compound() = default;
 
 
         // Member Functions
 
-            //- Return true if name is a known compound type
-            static bool isCompound(const word& name);
-
             bool empty() const
             {
                 return empty_;
@@ -207,9 +208,6 @@ public:
 
         // Operators
 
-            //- No default assign operator
-            compound& operator=(const compound&) = delete;
-
             //- Output operator
             friend Ostream& operator<<(Ostream& os, const compound& ct);
     };
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 16b78f40c3..608e835a0d 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -466,7 +466,7 @@ public:
             //- Return previous TimeState if time is being sub-cycled
             const TimeState& prevTimeState() const
             {
-                return prevTimeState_();
+                return *prevTimeState_;
             }
 
 
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index b1fb4b92ba..aea7319271 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -437,7 +437,7 @@ Foam::autoPtr<Foam::entry> Foam::entry::New(Istream& is)
 {
     is.fatalCheck(FUNCTION_NAME);
 
-    autoPtr<entry> ptr(nullptr);
+    autoPtr<entry> ptr;
 
     // Get the next keyword and if invalid return false
     keyType keyword;
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 3f47feba8c..825b562af7 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -197,7 +197,7 @@ public:
         autoPtr<functionObject> clone() const
         {
             NotImplemented;
-            return autoPtr<functionObject>(nullptr);
+            return autoPtr<functionObject>();
         }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index d6ec115a0f..76ee09ff27 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -483,7 +483,7 @@ Foam::IOdictionary& Foam::functionObjectList::stateDict()
         createStateDict();
     }
 
-    return stateDictPtr_();
+    return *stateDictPtr_;
 }
 
 
@@ -494,7 +494,7 @@ const Foam::IOdictionary& Foam::functionObjectList::stateDict() const
         createStateDict();
     }
 
-    return stateDictPtr_();
+    return *stateDictPtr_;
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObjectI.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObjectI.H
index e759243b5c..7fddc48b55 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObjectI.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObjectI.H
@@ -54,7 +54,7 @@ Foam::functionObjects::timeControl::writeControl() const
 inline const Foam::functionObject&
 Foam::functionObjects::timeControl::filter() const
 {
-    return foPtr_();
+    return *foPtr_;
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index a4156499a8..9c8e6f4056 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -214,7 +214,7 @@ Foam::OFstream& Foam::functionObjects::writeFile::file()
             << "File pointer not allocated";
     }
 
-    return filePtr_();
+    return *filePtr_;
 }
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 2bd29561b5..bdabea5352 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -131,7 +131,7 @@ Foam::Istream& Foam::regIOobject::readStream(const bool valid)
         isPtr_ = fileHandler().readStream(*this, objPath, type(), valid);
     }
 
-    return isPtr_();
+    return *isPtr_;
 }
 
 
@@ -174,7 +174,7 @@ Foam::Istream& Foam::regIOobject::readStream
         }
     }
 
-    return isPtr_();
+    return *isPtr_;
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index df0062d38a..755ca03967 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -285,7 +285,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
             ).ptr()
         );
     }
-    return redirectPatchFieldPtr_();
+    return *redirectPatchFieldPtr_;
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
index cd0b7ec418..a68d0e82d0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -78,7 +78,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {
     // For safety re-evaluate
     const scalar t = this->db().time().timeOutputValue();
@@ -94,7 +94,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf),
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {}
 
 
@@ -107,7 +107,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf, iF),
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {
     // For safety re-evaluate
     const scalar t = this->db().time().timeOutputValue();
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index a21c334ff5..3da0f018a0 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -74,7 +74,7 @@ Foam::fileMonitor& Foam::fileOperation::monitor() const
             )
         );
     }
-    return monitorPtr_();
+    return *monitorPtr_;
 }
 
 
@@ -597,7 +597,8 @@ const Foam::fileOperation& Foam::fileHandler()
 
         fileOperation::fileHandlerPtr_ = fileOperation::New(handler, true);
     }
-    return fileOperation::fileHandlerPtr_();
+
+    return *fileOperation::fileHandlerPtr_;
 }
 
 
@@ -618,7 +619,7 @@ void Foam::fileHandler(autoPtr<fileOperation>& newHandlerPtr)
 
     if (newHandlerPtr.valid())
     {
-        fileOperation::fileHandlerPtr_ = newHandlerPtr;
+        fileOperation::fileHandlerPtr_ = std::move(newHandlerPtr);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index 7f99e76a9f..4026e203bd 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
@@ -93,7 +93,7 @@ public:
         autoPtr<procLduInterface> clone()
         {
             NotImplemented;
-            return autoPtr<procLduInterface>(nullptr);
+            return autoPtr<procLduInterface>();
         }
 
         static autoPtr<procLduInterface> New(Istream& is)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index 2d85cca0ae..4fd508c6bf 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -139,7 +139,7 @@ Foam::lduMatrix::preconditioner::New
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::preconditioner>(nullptr);
+        return autoPtr<lduMatrix::preconditioner>();
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 0edeea6a9c..71c9475d39 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -143,7 +143,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::smoother>(nullptr);
+        return autoPtr<lduMatrix::smoother>();
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index 0bcd04bf4e..38e10b12e5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -123,7 +123,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::solver>(nullptr);
+        return autoPtr<lduMatrix::solver>();
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index ee20d9b461..d3b63e7b9d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -252,7 +252,7 @@ Foam::GAMGAgglomeration::GAMGAgglomeration
             *this,
             controlDict
         )
-      : autoPtr<GAMGProcAgglomeration>(nullptr)
+      : autoPtr<GAMGProcAgglomeration>()
     ),
 
     nCells_(maxLevels_),
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 78c8651d48..a46ba0d0d1 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,8 +25,15 @@ Class
     Foam::autoPtr
 
 Description
-    An auto-pointer similar to the STL auto_ptr but with automatic casting
-    to a reference to the type and with pointer allocation checking on access.
+    Pointer management similar to std::unique_ptr, with some additional
+    methods and type checking.
+
+Note
+    Parts of the interface now mirror std::unique_ptr, but since it pre-dates
+    both C++11 and std::unique_ptr, it has some additional idiosyncrasies.
+    The const-reference constructors and assignment operators
+    actually use move semantics to allow their participation in
+    default constructible, default assignable classes.
 
 SourceFiles
     autoPtrI.H
@@ -36,6 +43,13 @@ SourceFiles
 #ifndef autoPtr_H
 #define autoPtr_H
 
+// Transitional features/misfeatures:
+#define Foam_autoPtr_copyConstruct
+#define Foam_autoPtr_copyAssign
+#define Foam_autoPtr_castOperator
+
+#include <utility>
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -48,114 +62,217 @@ namespace Foam
 template<class T>
 class autoPtr
 {
-    // Public data
-
-        //- Pointer to object
-        mutable T* ptr_;
+    //- Pointer to managed object
+    T* ptr_;
 
 
 public:
 
-    typedef T Type;
+    // STL type definitions
+
+        //- Type of object being managed
+        typedef T element_type;
+
+        //- Pointer to type of object being managed
+        typedef T* pointer;
+
+
+    // Factory Methods
+
+        //- Construct autoPtr of T with forwarding arguments
+        //  \param args list of arguments with which an instance of T
+        //      will be constructed.
+        //
+        //  \note Similar to std::make_unique, but the overload for
+        //      array types is not disabled.
+        template<class... Args>
+        inline static autoPtr<T> New(Args&&... args);
+
+        //- Construct autoPtr from derived type with forwarding arguments
+        //  \param args list of arguments with which an instance of U
+        //      will be constructed.
+        //
+        //  \note Similar to New but for derived types.
+        //  In the future check for is_convertible on the pointer types
+        template<class U, class... Args>
+        inline static autoPtr<T> NewFrom(Args&&... args);
 
 
     // Constructors
 
-        //- Construct null with nullptr
-        inline explicit autoPtr();
+        //- Construct with no managed object.
+        inline constexpr autoPtr() noexcept;
 
-        //- Store object pointer
-        inline explicit autoPtr(T* p);
+        //- Construct with no managed object (literal nullptr).
+        inline constexpr autoPtr(std::nullptr_t) noexcept;
 
-        //- Construct as copy by transferring pointer to this autoPtr and
-        //- setting the arguments pointer to nullptr
-        inline autoPtr(const autoPtr<T>& ap);
+        //- Construct, taking ownership of the pointer.
+        inline explicit autoPtr(T* p) noexcept;
 
-        //- Construct either by transferring pointer or cloning.
-        //  Should only be called with type that supports cloning
-        inline autoPtr(const autoPtr<T>& ap, const bool reuse);
+        //- Move construct, transferring ownership.
+        inline autoPtr(autoPtr<T>&& ap) noexcept;
+
+        //- Move construct, transferring ownership from derived type.
+        //  U must be derivable from T
+        //  \note In the future check for is_convertible on the pointer types
+        template<class U>
+        inline explicit autoPtr(autoPtr<U>&& ap);
+
+        //- A move construct disguised as a copy construct (transfers ownership)
+        //  \remark This is a non-standard definition, and should ideally be
+        //      marked as deleted - pending cleanup of code currently relying
+        //      on this behaviour.
+        #ifdef Foam_autoPtr_copyConstruct
+        inline autoPtr(const autoPtr<T>& ap) noexcept;
+        #else
+        autoPtr(const autoPtr<T>& ap) = delete;
+        #endif
 
 
-    //- Destructor, delete object if pointer is not nullptr
-    inline ~autoPtr();
+    //- Destructs the managed object if such is present
+    inline ~autoPtr() noexcept;
 
 
     // Member Functions
 
-        // Check
+    // Check
 
-            //- Return true if the autoPtr is empty (ie, no pointer set)
-            inline bool empty() const;
+        //- True if the managed pointer is null
+        inline bool empty() const noexcept;
 
-            //- Return true if the autoPtr valid (ie, the pointer is set)
-            inline bool valid() const;
+        //- True if the managed pointer is non-null
+        inline bool valid() const noexcept;
 
 
-        // Edit
+    // Access
 
-            //- Release ownership of the object pointer and return the pointer
-            inline T* ptr();
+        //- Return pointer to managed object without nullptr checking.
+        //  Pointer remains under autoPtr management.
+        inline T* get() noexcept;
 
-            //- Set pointer to that given.
-            //  If object pointer already set issue a FatalError
-            inline void set(T* p);
+        //- Return const pointer to managed object without nullptr checking.
+        //  Pointer remains under autoPtr management.
+        inline const T* get() const noexcept;
 
-            //- If object pointer already set, delete object and set to given
-            //- pointer
-            inline void reset(T* p = nullptr);
-
-            //- Delete object (if the pointer is valid)
-            //- and set pointer to nullptr
-            inline void clear();
+        //- Return reference to the managed object without nullptr checking.
+        //  When get() == nullptr, additional guards may be required to avoid
+        //  inadvertent access to a nullptr.
+        inline T& ref();
 
 
-        // Access
+    // Edit
 
-            //- Return the pointer, without nullptr checking.
-            //  Pointer remains under autoPtr management.
-            inline T* rawPtr();
+        //- Return pointer to the managed object and release ownership.
+        inline T* release() noexcept;
 
-            //- Const access to the pointer, without nullptr checking.
-            //  Pointer remains under autoPtr management.
-            inline const T* rawPtr() const;
+        //- Return pointer to the managed object and release ownership.
+        //- Identical behaviour to release().
+        //  \note Provided for method naming consistent with Foam::tmp
+        inline T* ptr() noexcept;
 
-            //- Return the reference, without nullptr checking.
-            inline T& rawRef();
+        //- Delete managed object and set pointer to nullptr
+        inline void clear() noexcept;
 
-            //- Return the const reference, without nullptr checking.
-            inline const T& rawRef() const;
+        //- Delete managed object and set to new given pointer
+        inline void reset(T* p = nullptr) noexcept;
+
+        //- Delete managed object and set to new given pointer
+        //  \remark This is a non-standard definition, but may provide better
+        //      code documentation than a simple move assign would.
+        inline void reset(autoPtr<T>&& other) noexcept;
+
+        //- Delete managed object and set to new given pointer
+        //- Identical behaviour to reset().
+        //  \note Provided for backward compatibility - the older version
+        //      enforced a run-time check (Fatal if pointer was already set)
+        //      but this was rarely used.
+        inline void set(T* p) noexcept;
+
+        //- Swaps the managed object with other autoPtr.
+        inline void swap(autoPtr<T>& other) noexcept;
 
 
-        // Member operators
+    // Other
 
-            //- Return reference to the object data.
-            //  Fatal if no pointer is allocated.
-            inline T& operator()();
+        //- Construct copy by invoking clone on underlying managed object
+        //  \param args list of arguments for clone
+        template<class... Args>
+        inline autoPtr<T> clone(Args&&... args) const;
 
-            //- Return const reference to the object data
-            //  Fatal if no pointer is allocated.
-            inline const T& operator()() const;
 
-            //- Const cast to the underlying type reference
-            //  Fatal if no pointer is allocated.
-            inline operator const T&() const;
+    // Member Operators
 
-            //- Dereferences (non-const) pointer to the managed object
-            //  Fatal if no pointer is allocated.
-            inline T* operator->();
+        //- Return reference to the managed object.
+        //  Fatal error if no pointer is managed
+        inline T& operator*();
 
-            //- Dereferences (const) pointer to the managed object
-            //  Fatal if no pointer is allocated.
-            inline const T* operator->() const;
+        //- Return const reference to the object.
+        //  Fatal error if no pointer is managed
+        inline const T& operator*() const;
 
-            //- Take over the object pointer from parameter
-            inline void operator=(T* p);
+        //- Dereferences (non-const) pointer to the managed object
+        //  Fatal error if no pointer is managed
+        inline T* operator->();
 
-            //- Take over the object pointer from parameter
-            inline void operator=(const autoPtr<T>& ap);
+        //- Dereferences (const) pointer to the managed object
+        //  Fatal error if no pointer is managed
+        inline const T* operator->() const;
+
+        //- Return reference to the object data.
+        //  Fatal error if no pointer is managed
+        inline T& operator()();
+
+        //- Return const reference to the object data
+        //  Fatal error if no pointer is managed
+        inline const T& operator()() const;
+
+        //- Automatic cast conversion to the underlying type reference
+        //  Fatal error if no pointer is managed
+        #ifdef Foam_autoPtr_castOperator
+        inline operator const T&() const { return operator*(); }
+        #else
+        operator const T&() const = delete;
+        #endif
+
+
+        //- Transfer object ownership from parameter
+        inline void operator=(autoPtr<T>&& ap) noexcept;
+
+        //- Transfer object ownership from parameter
+        template<class U>
+        inline void operator=(autoPtr<U>&& ap) noexcept;
+
+        #ifdef Foam_autoPtr_copyAssign
+        //- A move assignment disguised as a copy assignment
+        //  \remark Non-standard definition - should just be movable
+        inline void operator=(const autoPtr<T>& ap) noexcept;
+        #else
+        void operator=(const autoPtr<T>& ap) = delete;
+        #endif
+
+        //- Allow reset via assignment from literal nullptr
+        inline void operator=(std::nullptr_t) noexcept;
+
+
+    // Housekeeping
+
+        //- Disallow assignment from plain pointer
+        //  \deprecated Convenient, but uncontrolled access (FEB-2018)
+        void operator=(T* p) = delete;
 };
 
 
+// Global Functions
+
+//- Specializes the Swap algorithm for autoPtr.
+//  Swaps the pointers of lhs and rhs. Calls \c lhs.swap(rhs)
+template<class T>
+void Swap(autoPtr<T>& lhs, autoPtr<T>& rhs)
+{
+    lhs.swap(rhs);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index a09209caa9..128fabe5ab 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,75 +26,119 @@ License
 #include "error.H"
 #include <typeinfo>
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+template<class... Args>
+inline Foam::autoPtr<T> Foam::autoPtr<T>::New(Args&&... args)
+{
+    return autoPtr<T>(new T(std::forward<Args>(args)...));
+}
+
+
+template<class T>
+template<class U, class... Args>
+inline Foam::autoPtr<T> Foam::autoPtr<T>::NewFrom(Args&&... args)
+{
+    return autoPtr<T>(new U(std::forward<Args>(args)...));
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr()
+inline constexpr Foam::autoPtr<T>::autoPtr() noexcept
 :
     ptr_(nullptr)
 {}
 
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr(T* p)
+inline constexpr Foam::autoPtr<T>::autoPtr(std::nullptr_t) noexcept
+:
+    ptr_(nullptr)
+{}
+
+
+template<class T>
+inline Foam::autoPtr<T>::autoPtr(T* p) noexcept
 :
     ptr_(p)
 {}
 
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap)
+inline Foam::autoPtr<T>::autoPtr(autoPtr<T>&& ap) noexcept
 :
-    ptr_(ap.ptr_)
-{
-    ap.ptr_ = nullptr;
-}
+    ptr_(ap.release())
+{}
 
 
 template<class T>
-inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap, const bool reuse)
-{
-    if (reuse)
-    {
-        ptr_ = ap.ptr_;
-        ap.ptr_ = nullptr;
-    }
-    else if (ap.valid())
-    {
-        ptr_ = ap().clone().ptr();
-    }
-    else
-    {
-        ptr_ = nullptr;
-    }
-}
+template<class U>
+inline Foam::autoPtr<T>::autoPtr(autoPtr<U>&& ap)
+:
+    ptr_(ap.release())
+{}
 
 
+#ifdef Foam_autoPtr_copyConstruct
+template<class T>
+inline Foam::autoPtr<T>::autoPtr(const autoPtr<T>& ap) noexcept
+:
+    ptr_(const_cast<autoPtr<T>&>(ap).release())
+{}
+#endif
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
 template<class T>
-inline Foam::autoPtr<T>::~autoPtr()
+inline Foam::autoPtr<T>::~autoPtr() noexcept
 {
-    clear();
+    reset(nullptr);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-inline bool Foam::autoPtr<T>::empty() const
+inline bool Foam::autoPtr<T>::empty() const noexcept
 {
     return !ptr_;
 }
 
 
 template<class T>
-inline bool Foam::autoPtr<T>::valid() const
+inline bool Foam::autoPtr<T>::valid() const noexcept
 {
     return ptr_;
 }
 
 
 template<class T>
-inline T* Foam::autoPtr<T>::ptr()
+inline T* Foam::autoPtr<T>::get() noexcept
+{
+    return ptr_;
+}
+
+
+template<class T>
+inline const T* Foam::autoPtr<T>::get() const noexcept
+{
+    return ptr_;
+}
+
+
+template<class T>
+inline T& Foam::autoPtr<T>::ref()
+{
+    return *ptr_;
+}
+
+
+template<class T>
+inline T* Foam::autoPtr<T>::release() noexcept
 {
     T* p = ptr_;
     ptr_ = nullptr;
@@ -103,103 +147,82 @@ inline T* Foam::autoPtr<T>::ptr()
 
 
 template<class T>
-inline void Foam::autoPtr<T>::set(T* p)
+inline T* Foam::autoPtr<T>::ptr() noexcept
 {
-    if (ptr_)
-    {
-        FatalErrorInFunction
-            << "object of type " << typeid(T).name()
-            << " already allocated"
-            << abort(FatalError);
-    }
-
-    ptr_ = p;
+    return release();
 }
 
 
 template<class T>
-inline void Foam::autoPtr<T>::reset(T* p)
-{
-    if (ptr_)
-    {
-        delete ptr_;
-    }
-
-    ptr_ = p;
-}
-
-
-template<class T>
-inline void Foam::autoPtr<T>::clear()
+inline void Foam::autoPtr<T>::clear() noexcept
 {
     reset(nullptr);
 }
 
 
 template<class T>
-inline T* Foam::autoPtr<T>::rawPtr()
+inline void Foam::autoPtr<T>::reset(T* p) noexcept
 {
-    return ptr_;
+    if (ptr_) delete ptr_;
+    ptr_ = p;
 }
 
 
 template<class T>
-inline const T* Foam::autoPtr<T>::rawPtr() const
+inline void Foam::autoPtr<T>::reset(autoPtr<T>&& ap) noexcept
 {
-    return ptr_;
+    reset(ap.release());
 }
 
 
 template<class T>
-inline T& Foam::autoPtr<T>::rawRef()
+inline void Foam::autoPtr<T>::set(T* p) noexcept
 {
-    return *ptr_;
+    reset(p);
 }
 
 
 template<class T>
-inline const T& Foam::autoPtr<T>::rawRef() const
+inline void Foam::autoPtr<T>::swap(autoPtr<T>& other) noexcept
 {
-    return *ptr_;
+    T* p = ptr_;
+    ptr_ = other.ptr_;
+    other.ptr_ = p;
+}
+
+
+template<class T>
+template<class... Args>
+inline Foam::autoPtr<T> Foam::autoPtr<T>::clone(Args&&... args) const
+{
+    if (ptr_)
+    {
+        return autoPtr<T>(ptr_->clone(std::forward<Args>(args)...).ptr());
+    }
+
+    return autoPtr<T>();
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
-inline T& Foam::autoPtr<T>::operator()()
+inline T& Foam::autoPtr<T>::operator*()
 {
     if (!ptr_)
     {
         FatalErrorInFunction
-            << "object of type " << typeid(T).name()
-            << " is not allocated"
+            << "object of type " << typeid(T).name() << " is unallocated"
             << abort(FatalError);
     }
-
     return *ptr_;
 }
 
 
 template<class T>
-inline const T& Foam::autoPtr<T>::operator()() const
+inline const T& Foam::autoPtr<T>::operator*() const
 {
-    if (!ptr_)
-    {
-        FatalErrorInFunction
-            << "object of type " << typeid(T).name()
-            << " is not allocated"
-            << abort(FatalError);
-    }
-
-    return *ptr_;
-}
-
-
-template<class T>
-inline Foam::autoPtr<T>::operator const T&() const
-{
-    return operator()();
+    return const_cast<autoPtr<T>*>(this)->operator*();
 }
 
 
@@ -209,11 +232,9 @@ inline T* Foam::autoPtr<T>::operator->()
     if (!ptr_)
     {
         FatalErrorInFunction
-            << "object of type " << typeid(T).name()
-            << " is not allocated"
+            << "object of type " << typeid(T).name() << " is unallocated"
             << abort(FatalError);
     }
-
     return ptr_;
 }
 
@@ -221,25 +242,59 @@ inline T* Foam::autoPtr<T>::operator->()
 template<class T>
 inline const T* Foam::autoPtr<T>::operator->() const
 {
-    return const_cast<autoPtr<T>&>(*this).operator->();
+    return const_cast<autoPtr<T>*>(this)->operator->();
 }
 
 
 template<class T>
-inline void Foam::autoPtr<T>::operator=(T* p)
+inline T& Foam::autoPtr<T>::operator()()
 {
-    reset(p);
+    return operator*();
 }
 
 
 template<class T>
-inline void Foam::autoPtr<T>::operator=(const autoPtr<T>& ap)
+inline const T& Foam::autoPtr<T>::operator()() const
+{
+    return operator*();
+}
+
+
+template<class T>
+inline void Foam::autoPtr<T>::operator=(autoPtr<T>&& ap) noexcept
 {
     if (this != &ap)
     {
-        reset(const_cast<autoPtr<T>&>(ap).ptr());
+        reset(ap.release());
     }
 }
 
 
+template<class T>
+template<class U>
+inline void Foam::autoPtr<T>::operator=(autoPtr<U>&& ap) noexcept
+{
+    if (this != &ap)
+    {
+        reset(ap.release());
+    }
+}
+
+
+#ifdef Foam_autoPtr_copyAssign
+template<class T>
+inline void Foam::autoPtr<T>::operator=(const autoPtr<T>& ap) noexcept
+{
+    operator=(std::move(const_cast<autoPtr<T>&>(ap)));
+}
+#endif
+
+
+template<class T>
+inline void Foam::autoPtr<T>::operator=(std::nullptr_t) noexcept
+{
+    reset();
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 3492a115b7..6a57e0a0d0 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1888,7 +1888,8 @@ const Foam::labelList& Foam::globalMeshData::sharedPointGlobalLabels() const
             sharedPointGlobalLabels = -1;
         }
     }
-    return sharedPointGlobalLabelsPtr_();
+
+    return *sharedPointGlobalLabelsPtr_;
 }
 
 
@@ -2025,7 +2026,7 @@ const Foam::labelList& Foam::globalMeshData::sharedPointLabels() const
     {
         calcSharedPoints();
     }
-    return sharedPointLabelsPtr_();
+    return *sharedPointLabelsPtr_;
 }
 
 
@@ -2035,7 +2036,7 @@ const Foam::labelList& Foam::globalMeshData::sharedPointAddr() const
     {
         calcSharedPoints();
     }
-    return sharedPointAddrPtr_();
+    return *sharedPointAddrPtr_;
 }
 
 
@@ -2055,7 +2056,7 @@ const Foam::labelList& Foam::globalMeshData::sharedEdgeLabels() const
     {
         calcSharedEdges();
     }
-    return sharedEdgeLabelsPtr_();
+    return *sharedEdgeLabelsPtr_;
 }
 
 
@@ -2065,7 +2066,7 @@ const Foam::labelList& Foam::globalMeshData::sharedEdgeAddr() const
     {
         calcSharedEdges();
     }
-    return sharedEdgeAddrPtr_();
+    return *sharedEdgeAddrPtr_;
 }
 
 
@@ -2126,7 +2127,7 @@ const Foam::indirectPrimitivePatch& Foam::globalMeshData::coupledPatch() const
                 << endl;
         }
     }
-    return coupledPatchPtr_();
+    return *coupledPatchPtr_;
 }
 
 
@@ -2146,7 +2147,7 @@ const Foam::labelList& Foam::globalMeshData::coupledPatchMeshEdges() const
             )
         );
     }
-    return coupledPatchMeshEdgesPtr_();
+    return *coupledPatchMeshEdgesPtr_;
 }
 
 
@@ -2165,7 +2166,7 @@ const
             em.insert(me[i], i);
         }
     }
-    return coupledPatchMeshEdgeMapPtr_();
+    return *coupledPatchMeshEdgeMapPtr_;
 }
 
 
@@ -2178,7 +2179,7 @@ const Foam::globalIndex& Foam::globalMeshData::globalPointNumbering() const
             new globalIndex(coupledPatch().nPoints())
         );
     }
-    return globalPointNumberingPtr_();
+    return *globalPointNumberingPtr_;
 }
 
 
@@ -2189,7 +2190,7 @@ Foam::globalMeshData::globalTransforms() const
     {
         globalTransformsPtr_.reset(new globalIndexAndTransform(mesh_));
     }
-    return globalTransformsPtr_();
+    return *globalTransformsPtr_;
 }
 
 
@@ -2199,7 +2200,7 @@ const Foam::labelListList& Foam::globalMeshData::globalPointSlaves() const
     {
         calcGlobalPointSlaves();
     }
-    return globalPointSlavesPtr_();
+    return *globalPointSlavesPtr_;
 }
 
 
@@ -2210,7 +2211,7 @@ const
     {
         calcGlobalPointSlaves();
     }
-    return globalPointTransformedSlavesPtr_();
+    return *globalPointTransformedSlavesPtr_;
 }
 
 
@@ -2220,7 +2221,7 @@ const Foam::mapDistribute& Foam::globalMeshData::globalPointSlavesMap() const
     {
         calcGlobalPointSlaves();
     }
-    return globalPointSlavesMapPtr_();
+    return *globalPointSlavesMapPtr_;
 }
 
 
@@ -2233,7 +2234,7 @@ const Foam::globalIndex& Foam::globalMeshData::globalEdgeNumbering() const
             new globalIndex(coupledPatch().nEdges())
         );
     }
-    return globalEdgeNumberingPtr_();
+    return *globalEdgeNumberingPtr_;
 }
 
 
@@ -2243,7 +2244,7 @@ const Foam::labelListList& Foam::globalMeshData::globalEdgeSlaves() const
     {
         calcGlobalEdgeSlaves();
     }
-    return globalEdgeSlavesPtr_();
+    return *globalEdgeSlavesPtr_;
 }
 
 
@@ -2254,7 +2255,7 @@ const
     {
         calcGlobalEdgeSlaves();
     }
-    return globalEdgeTransformedSlavesPtr_();
+    return *globalEdgeTransformedSlavesPtr_;
 }
 
 
@@ -2264,7 +2265,7 @@ const Foam::PackedBoolList& Foam::globalMeshData::globalEdgeOrientation() const
     {
         calcGlobalEdgeOrientation();
     }
-    return globalEdgeOrientationPtr_();
+    return *globalEdgeOrientationPtr_;
 }
 
 
@@ -2274,7 +2275,7 @@ const Foam::mapDistribute& Foam::globalMeshData::globalEdgeSlavesMap() const
     {
         calcGlobalEdgeSlaves();
     }
-    return globalEdgeSlavesMapPtr_();
+    return *globalEdgeSlavesMapPtr_;
 }
 
 
@@ -2285,7 +2286,7 @@ const
     {
         calcGlobalPointBoundaryFaces();
     }
-    return globalBoundaryFaceNumberingPtr_();
+    return *globalBoundaryFaceNumberingPtr_;
 }
 
 
@@ -2296,7 +2297,7 @@ const
     {
         calcGlobalPointBoundaryFaces();
     }
-    return globalPointBoundaryFacesPtr_();
+    return *globalPointBoundaryFacesPtr_;
 }
 
 
@@ -2307,7 +2308,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryFaces() const
     {
         calcGlobalPointBoundaryFaces();
     }
-    return globalPointTransformedBoundaryFacesPtr_();
+    return *globalPointTransformedBoundaryFacesPtr_;
 }
 
 
@@ -2318,7 +2319,7 @@ const
     {
         calcGlobalPointBoundaryFaces();
     }
-    return globalPointBoundaryFacesMapPtr_();
+    return *globalPointBoundaryFacesMapPtr_;
 }
 
 
@@ -2328,7 +2329,7 @@ const Foam::labelList& Foam::globalMeshData::boundaryCells() const
     {
         calcGlobalPointBoundaryCells();
     }
-    return boundaryCellsPtr_();
+    return *boundaryCellsPtr_;
 }
 
 
@@ -2339,7 +2340,7 @@ const
     {
         calcGlobalPointBoundaryCells();
     }
-    return globalBoundaryCellNumberingPtr_();
+    return *globalBoundaryCellNumberingPtr_;
 }
 
 
@@ -2350,7 +2351,7 @@ const
     {
         calcGlobalPointBoundaryCells();
     }
-    return globalPointBoundaryCellsPtr_();
+    return *globalPointBoundaryCellsPtr_;
 }
 
 
@@ -2361,7 +2362,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryCells() const
     {
         calcGlobalPointBoundaryCells();
     }
-    return globalPointTransformedBoundaryCellsPtr_();
+    return *globalPointTransformedBoundaryCellsPtr_;
 }
 
 
@@ -2372,7 +2373,7 @@ const
     {
         calcGlobalPointBoundaryCells();
     }
-    return globalPointBoundaryCellsMapPtr_();
+    return *globalPointBoundaryCellsMapPtr_;
 }
 
 
@@ -2382,7 +2383,7 @@ const Foam::labelListList& Foam::globalMeshData::globalCoPointSlaves() const
     {
         calcGlobalCoPointSlaves();
     }
-    return globalCoPointSlavesPtr_();
+    return *globalCoPointSlavesPtr_;
 }
 
 
@@ -2392,7 +2393,7 @@ const Foam::mapDistribute& Foam::globalMeshData::globalCoPointSlavesMap() const
     {
         calcGlobalCoPointSlaves();
     }
-    return globalCoPointSlavesMapPtr_();
+    return *globalCoPointSlavesMapPtr_;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
index 20dbd3bc1c..cfb4f53eea 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H
@@ -347,13 +347,13 @@ public:
             //- Corresponding map
             const mapDistribute& map() const
             {
-                return map_();
+                return *map_;
             }
 
             //- Corresponding map
             mapDistribute& map()
             {
-                return map_();
+                return *map_;
             }
 
             //- From (mesh or patch) point to index in procPoints
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
index 67c436c4b8..9968377c54 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
@@ -183,7 +183,7 @@ const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
             )
         );
     }
-    return schedulePtr_();
+    return *schedulePtr_;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
index 45a1563342..a8dcb1886f 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
@@ -174,8 +174,18 @@ Foam::mapPolyMesh::mapPolyMesh
     oldPatchSizes_(oldPatchStarts.size()),
     oldPatchStarts_(oldPatchStarts, reuse),
     oldPatchNMeshPoints_(oldPatchNMeshPoints, reuse),
-    oldCellVolumesPtr_(oldCellVolumesPtr, reuse)
+    oldCellVolumesPtr_()
 {
+    // Reuse old content or clone
+    if (reuse)
+    {
+        oldCellVolumesPtr_ = std::move(oldCellVolumesPtr);
+    }
+    else
+    {
+        oldCellVolumesPtr_ = oldCellVolumesPtr.clone();
+    }
+
     if (oldPatchStarts_.size() > 0)
     {
         // Calculate old patch sizes
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index 03f1c8a55d..5fd0673984 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -645,7 +645,7 @@ public:
 
                 const scalarField& oldCellVolumes() const
                 {
-                    return oldCellVolumesPtr_();
+                    return *oldCellVolumesPtr_;
                 }
 
 };
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 6b36461924..3f75be93e5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -365,7 +365,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
         }
     }
 
-    return neighbourEdgesPtr_();
+    return *neighbourEdgesPtr_;
 }
 
 
@@ -394,7 +394,8 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
             }
         }
     }
-    return patchIDPtr_();
+
+    return *patchIDPtr_;
 }
 
 
@@ -446,7 +447,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
         }
     }
 
-    return groupPatchIDsPtr_();
+    return *groupPatchIDsPtr_;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index de8d164ef7..b840b7d8d8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -151,10 +151,8 @@ Foam::autoPtr<Foam::labelIOList> Foam::polyMesh::readTetBasePtIs() const
     {
         return autoPtr<labelIOList>(new labelIOList(io));
     }
-    else
-    {
-        return autoPtr<labelIOList>(nullptr);
-    }
+
+    return autoPtr<labelIOList>();
 }
 
 
@@ -873,7 +871,7 @@ const Foam::labelIOList& Foam::polyMesh::tetBasePtIs() const
         );
     }
 
-    return tetBasePtIsPtr_();
+    return *tetBasePtIsPtr_;
 }
 
 
@@ -1078,7 +1076,7 @@ const Foam::pointField& Foam::polyMesh::oldPoints() const
         curMotionTimeIndex_ = time().timeIndex();
     }
 
-    return oldPointsPtr_();
+    return *oldPointsPtr_;
 }
 
 
@@ -1231,7 +1229,7 @@ const Foam::globalMeshData& Foam::polyMesh::globalData() const
         globalMeshDataPtr_.reset(new globalMeshData(*this));
     }
 
-    return globalMeshDataPtr_();
+    return *globalMeshDataPtr_;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index e290c689f9..a88f5b12f3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -452,7 +452,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         autoPtr<labelIOList> newTetBasePtIsPtr = readTetBasePtIs();
         if (newTetBasePtIsPtr.valid())
         {
-            tetBasePtIsPtr_ = newTetBasePtIsPtr;
+            tetBasePtIsPtr_ = std::move(newTetBasePtIsPtr);
         }
 
         // Calculate the geometry for the patches (transformation tensors etc.)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 0c5b728465..201b3cddbe 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -511,7 +511,7 @@ const Foam::labelList& Foam::processorPolyPatch::neighbPoints() const
             << "No extended addressing calculated for patch " << name()
             << abort(FatalError);
     }
-    return neighbPointsPtr_();
+    return *neighbPointsPtr_;
 }
 
 
@@ -523,7 +523,7 @@ const Foam::labelList& Foam::processorPolyPatch::neighbEdges() const
             << "No extended addressing calculated for patch " << name()
             << abort(FatalError);
     }
-    return neighbEdgesPtr_();
+    return *neighbEdgesPtr_;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index c952a6f6c8..54a0046996 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -52,8 +52,8 @@ template<class Type>
 Foam::Function1Types::Scale<Type>::Scale(const Scale<Type>& se)
 :
     Function1<Type>(se),
-    scale_(se.scale_, false),
-    value_(se.value_, false)
+    scale_(se.scale_.clone()),
+    value_(se.value_.clone())
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 7fa813c79d..732f329147 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -56,10 +56,10 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& se)
 :
     Function1<Type>(se),
     t0_(se.t0_),
-    amplitude_(se.amplitude_, false),
-    frequency_(se.frequency_, false),
-    scale_(se.scale_, false),
-    level_(se.level_, false)
+    amplitude_(se.amplitude_.clone()),
+    frequency_(se.frequency_.clone()),
+    scale_(se.scale_.clone()),
+    level_(se.level_.clone())
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
index e18ed2da7c..d9f06f5bc5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -58,10 +58,10 @@ Foam::Function1Types::Square<Type>::Square(const Square<Type>& se)
     Function1<Type>(se),
     t0_(se.t0_),
     markSpace_(se.markSpace_),
-    amplitude_(se.amplitude_, false),
-    frequency_(se.frequency_, false),
-    scale_(se.scale_, false),
-    level_(se.level_, false)
+    amplitude_(se.amplitude_.clone()),
+    frequency_(se.frequency_.clone()),
+    scale_(se.scale_.clone()),
+    level_(se.level_.clone())
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 5a6e510411..c068e240c2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -49,7 +49,7 @@ Foam::Function1Types::TableBase<Type>::interpolator() const
         );
     }
 
-    return interpolatorPtr_();
+    return *interpolatorPtr_;
 }
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index dbd1291172..5fb7fffe50 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -177,7 +177,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     Q_(ptf.Q_),
     q_(ptf.q_, mapper),
     h_(ptf.h_, mapper),
-    Ta_(ptf.Ta_, false),
+    Ta_(ptf.Ta_.clone()),
     relaxation_(ptf.relaxation_),
     emissivity_(ptf.emissivity_),
     qrPrevious_(ptf.qrPrevious_, mapper),
@@ -225,7 +225,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     Q_(ewhftpsf.Q_),
     q_(ewhftpsf.q_),
     h_(ewhftpsf.h_),
-    Ta_(ewhftpsf.Ta_, false),
+    Ta_(ewhftpsf.Ta_.clone()),
     relaxation_(ewhftpsf.relaxation_),
     emissivity_(ewhftpsf.emissivity_),
     qrPrevious_(ewhftpsf.qrPrevious_),
@@ -249,7 +249,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     Q_(ewhftpsf.Q_),
     q_(ewhftpsf.q_),
     h_(ewhftpsf.h_),
-    Ta_(ewhftpsf.Ta_, false),
+    Ta_(ewhftpsf.Ta_.clone()),
     relaxation_(ewhftpsf.relaxation_),
     emissivity_(ewhftpsf.emissivity_),
     qrPrevious_(ewhftpsf.qrPrevious_),
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 00883665e8..1ebdbcf59d 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -204,7 +204,7 @@ const solidType& thermalBaffle1DFvPatchScalarField<solidType>::solid() const
         {
             solidPtr_.reset(new solidType(solidDict_));
         }
-        return solidPtr_();
+        return *solidPtr_;
     }
     else
     {
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
index 297e86b3d3..b3a57319aa 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
@@ -201,7 +201,7 @@ public:
             //- Access function to filter width
             inline const volScalarField& delta() const
             {
-                return delta_();
+                return *delta_;
             }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
index 82acfff3a6..7b9769a948 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
@@ -104,7 +104,7 @@ public:
         //- Return the hmax delta field
         const volScalarField& hmax() const
         {
-            return hmaxPtr_();
+            return *hmaxPtr_;
         }
 
         // Correct values
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
index 0840a26450..19b9db63c7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -177,7 +177,7 @@ public:
         //- Access function to filter width
         inline const volScalarField& delta() const
         {
-            return delta_();
+            return *delta_;
         }
 };
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index 486581871a..be957dcaac 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -59,7 +59,7 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     D_(Function1<scalar>::New("D", dict)),
     I_(Function1<scalar>::New("I", dict)),
     length_(readScalar(dict.lookup("length"))),
-    uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false))
+    uniformJump_(dict.lookupOrDefault("uniformJump", false))
 {
     fvPatchField<scalar>::operator=
     (
@@ -79,8 +79,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf, p, iF, mapper),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_, false),
-    I_(ptf.I_, false),
+    D_(ptf.D_.clone()),
+    I_(ptf.I_.clone()),
     length_(ptf.length_),
     uniformJump_(ptf.uniformJump_)
 {}
@@ -95,8 +95,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_, false),
-    I_(ptf.I_, false),
+    D_(ptf.D_.clone()),
+    I_(ptf.I_.clone()),
     length_(ptf.length_),
     uniformJump_(ptf.uniformJump_)
 {}
@@ -111,8 +111,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf, iF),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_, false),
-    I_(ptf.I_, false),
+    D_(ptf.D_.clone()),
+    I_(ptf.I_.clone()),
     length_(ptf.length_),
     uniformJump_(ptf.uniformJump_)
 {}
diff --git a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
index e2b2440b5a..72171d8a91 100644
--- a/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
+++ b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C
@@ -50,14 +50,14 @@ Foam::combustionModels::psiThermoCombustion::~psiThermoCombustion()
 Foam::psiReactionThermo&
 Foam::combustionModels::psiThermoCombustion::thermo()
 {
-    return thermoPtr_();
+    return *thermoPtr_;
 }
 
 
 const Foam::psiReactionThermo&
 Foam::combustionModels::psiThermoCombustion::thermo() const
 {
-    return thermoPtr_();
+    return *thermoPtr_;
 }
 
 
diff --git a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
index a4a5be12c5..e9b0e301c7 100644
--- a/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
+++ b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C
@@ -50,14 +50,14 @@ Foam::combustionModels::rhoThermoCombustion::~rhoThermoCombustion()
 Foam::rhoReactionThermo&
 Foam::combustionModels::rhoThermoCombustion::thermo()
 {
-    return thermoPtr_();
+    return *thermoPtr_;
 }
 
 
 const Foam::rhoReactionThermo&
 Foam::combustionModels::rhoThermoCombustion::thermo() const
 {
-    return thermoPtr_();
+    return *thermoPtr_;
 }
 
 
diff --git a/src/conversion/common/reader/meshReader.C b/src/conversion/common/reader/meshReader.C
index dd3650db67..deb60d8b52 100644
--- a/src/conversion/common/reader/meshReader.C
+++ b/src/conversion/common/reader/meshReader.C
@@ -91,7 +91,7 @@ Foam::autoPtr<Foam::polyMesh> Foam::meshReader::mesh
     createPolyBoundary();
     clearExtraStorage();
 
-    autoPtr<polyMesh> mesh
+    autoPtr<polyMesh> meshPtr
     (
         new polyMesh
         (
@@ -106,16 +106,17 @@ Foam::autoPtr<Foam::polyMesh> Foam::meshReader::mesh
             xferMove(cellPolys_)
         )
     );
+    polyMesh& mesh = meshPtr();
 
-    // adding patches also checks the mesh
-    mesh().addPatches(polyBoundaryPatches(mesh));
+    // Adding patches also checks the mesh
+    mesh.addPatches(polyBoundaryPatches(mesh));
 
-    warnDuplicates("boundaries", mesh().boundaryMesh().names());
+    warnDuplicates("boundaries", mesh.boundaryMesh().names());
 
-    addCellZones(mesh());
-    addFaceZones(mesh());
+    addCellZones(mesh);
+    addFaceZones(mesh);
 
-    return mesh;
+    return meshPtr;
 }
 
 
diff --git a/src/conversion/ensight/mesh/ensightMeshI.H b/src/conversion/ensight/mesh/ensightMeshI.H
index 8213182e27..7b7fd206d2 100644
--- a/src/conversion/ensight/mesh/ensightMeshI.H
+++ b/src/conversion/ensight/mesh/ensightMeshI.H
@@ -77,7 +77,7 @@ Foam::ensightMesh::faceZoneFaces() const
 
 inline void Foam::ensightMesh::write(autoPtr<ensightGeoFile>& os) const
 {
-    write(os.rawRef());
+    write(os.ref());
 }
 
 
diff --git a/src/conversion/ensight/mesh/ensightMeshOptions.C b/src/conversion/ensight/mesh/ensightMeshOptions.C
index 573ddeee71..7dbafafab2 100644
--- a/src/conversion/ensight/mesh/ensightMeshOptions.C
+++ b/src/conversion/ensight/mesh/ensightMeshOptions.C
@@ -136,7 +136,7 @@ const Foam::wordRes& Foam::ensightMesh::options::patchSelection() const
 {
     if (usePatchSelection())
     {
-        return patchPatterns_();
+        return *patchPatterns_;
     }
 
     return wordRes::null();
@@ -147,7 +147,7 @@ const Foam::wordRes& Foam::ensightMesh::options::faceZoneSelection() const
 {
     if (faceZonePatterns_.valid())
     {
-        return faceZonePatterns_();
+        return *faceZonePatterns_;
     }
 
     return wordRes::null();
diff --git a/src/conversion/ensight/output/ensightOutput.H b/src/conversion/ensight/output/ensightOutput.H
index bdead411f4..168b11d5e0 100644
--- a/src/conversion/ensight/output/ensightOutput.H
+++ b/src/conversion/ensight/output/ensightOutput.H
@@ -143,7 +143,7 @@ public:
         const bool nodeValues = false
     )
     {
-        return writeField(vf, ensMesh, output.rawRef(), nodeValues);
+        return writeField(vf, ensMesh, output.ref(), nodeValues);
     }
 
 };
diff --git a/src/conversion/ensight/output/ensightSerialOutput.H b/src/conversion/ensight/output/ensightSerialOutput.H
index 823c7ba5bf..22c47bf3be 100644
--- a/src/conversion/ensight/output/ensightSerialOutput.H
+++ b/src/conversion/ensight/output/ensightSerialOutput.H
@@ -112,7 +112,7 @@ public:
         autoPtr<ensightFile>& output
     )
     {
-        return writeField(vf, part, output.rawRef());
+        return writeField(vf, part, output.ref());
     }
 
 
@@ -125,7 +125,7 @@ public:
         autoPtr<ensightFile>& output
     )
     {
-        return writeField(vf, list, output.rawRef());
+        return writeField(vf, list, output.ref());
     }
 
 };
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H
index 7fd4aa4f5d..f793adab1f 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.H
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.H
@@ -127,7 +127,7 @@ public:
 
         inline vtk::formatter& format()
         {
-            return format_();
+            return *format_;
         }
 
 
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index 627b847882..e7bcd15dbe 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -133,7 +133,7 @@ public:
 
         inline vtk::formatter& format()
         {
-            return format_();
+            return *format_;
         }
 
         inline label nPoints() const
diff --git a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
index ea463c41c2..feb241f134 100644
--- a/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
+++ b/src/conversion/vtk/output/foamVtkSurfaceMeshWriter.H
@@ -122,7 +122,7 @@ public:
 
         inline vtk::formatter& format()
         {
-            return format_();
+            return *format_;
         }
 
         //- Open write for CellData of count fields.
diff --git a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C
index 307c32488a..e46a3b95e8 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.C
@@ -61,7 +61,7 @@ Foam::dynamicMotionSolverFvMesh::~dynamicMotionSolverFvMesh()
 
 const Foam::motionSolver& Foam::dynamicMotionSolverFvMesh::motion() const
 {
-    return motionPtr_();
+    return *motionPtr_;
 }
 
 
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 409f533269..12d6f45d53 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -223,11 +223,11 @@ Foam::dynamicRefineFvMesh::refine
     meshCutter_.setRefinement(cellsToRefine, meshMod);
 
     // Create mesh (with inflation), return map from old to new mesh.
-    //autoPtr<mapPolyMesh> map = meshMod.changeMesh(*this, true);
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(*this, false);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(*this, false);
+    mapPolyMesh& map = *mapPtr;
 
     Info<< "Refined from "
-        << returnReduce(map().nOldCells(), sumOp<label>())
+        << returnReduce(map.nOldCells(), sumOp<label>())
         << " to " << globalData().nTotalCells() << " cells." << endl;
 
     if (debug)
@@ -235,7 +235,7 @@ Foam::dynamicRefineFvMesh::refine
         // Check map.
         for (label facei = 0; facei < nInternalFaces(); facei++)
         {
-            label oldFacei = map().faceMap()[facei];
+            label oldFacei = map.faceMap()[facei];
 
             if (oldFacei >= nInternalFaces())
             {
@@ -256,26 +256,11 @@ Foam::dynamicRefineFvMesh::refine
     // Update fields
     updateMesh(map);
 
-
-    // Move mesh
-    /*
-    pointField newPoints;
-    if (map().hasMotionPoints())
-    {
-        newPoints = map().preMotionPoints();
-    }
-    else
-    {
-        newPoints = points();
-    }
-    movePoints(newPoints);
-    */
-
     // Correct the flux for modified/added faces. All the faces which only
     // have been renumbered will already have been handled by the mapping.
     {
-        const labelList& faceMap = map().faceMap();
-        const labelList& reverseFaceMap = map().reverseFaceMap();
+        const labelList& faceMap = map.faceMap();
+        const labelList& reverseFaceMap = map.reverseFaceMap();
 
         // Storage for any master faces. These will be the original faces
         // on the coarse cell that get split into four (or rather the
@@ -437,7 +422,6 @@ Foam::dynamicRefineFvMesh::refine
     }
 
 
-
     // Update numbering of cells/vertices.
     meshCutter_.updateMesh(map);
 
@@ -448,7 +432,7 @@ Foam::dynamicRefineFvMesh::refine
 
         forAll(newProtectedCell, celli)
         {
-            label oldCelli = map().cellMap()[celli];
+            const label oldCelli = map.cellMap()[celli];
             newProtectedCell.set(celli, protectedCell_.get(oldCelli));
         }
         protectedCell_.transfer(newProtectedCell);
@@ -457,7 +441,7 @@ Foam::dynamicRefineFvMesh::refine
     // Debug: Check refinement levels (across faces only)
     meshCutter_.checkRefinementLevels(-1, labelList(0));
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -504,36 +488,21 @@ Foam::dynamicRefineFvMesh::unrefine
 
 
     // Change mesh and generate map.
-    //autoPtr<mapPolyMesh> map = meshMod.changeMesh(*this, true);
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(*this, false);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(*this, false);
+    mapPolyMesh& map = *mapPtr;
 
     Info<< "Unrefined from "
-        << returnReduce(map().nOldCells(), sumOp<label>())
+        << returnReduce(map.nOldCells(), sumOp<label>())
         << " to " << globalData().nTotalCells() << " cells."
         << endl;
 
     // Update fields
     updateMesh(map);
 
-
-    // Move mesh
-    /*
-    pointField newPoints;
-    if (map().hasMotionPoints())
-    {
-        newPoints = map().preMotionPoints();
-    }
-    else
-    {
-        newPoints = points();
-    }
-    movePoints(newPoints);
-    */
-
     // Correct the flux for modified faces.
     {
-        const labelList& reversePointMap = map().reversePointMap();
-        const labelList& reverseFaceMap = map().reverseFaceMap();
+        const labelList& reversePointMap = map.reversePointMap();
+        const labelList& reverseFaceMap = map.reverseFaceMap();
 
         HashTable<surfaceScalarField*> fluxes
         (
@@ -626,7 +595,7 @@ Foam::dynamicRefineFvMesh::unrefine
 
         forAll(newProtectedCell, celli)
         {
-            label oldCelli = map().cellMap()[celli];
+            label oldCelli = map.cellMap()[celli];
             if (oldCelli >= 0)
             {
                 newProtectedCell.set(celli, protectedCell_.get(oldCelli));
@@ -638,7 +607,7 @@ Foam::dynamicRefineFvMesh::unrefine
     // Debug: Check refinement levels (across faces only)
     meshCutter_.checkRefinementLevels(-1, labelList(0));
 
-    return map;
+    return mapPtr;
 }
 
 
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 7873504aa8..3f03825504 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -145,7 +145,6 @@ extrudePatchMesh::extrudePatchMesh
     }
 
     extrudeMesh(regionPatches);
-
 }
 
 
@@ -341,7 +340,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
         );
 
         // Update numbering on extruder.
-        extruder.updateMesh(map);
+        extruder.updateMesh(map());
 
         this->setInstance(this->thisDb().time().constant());
         this->write();
@@ -349,15 +348,6 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-extrudePatchMesh::~extrudePatchMesh()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
index 2a6a719afc..6ff5933f39 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -148,7 +148,7 @@ public:
 
 
     //- Destructor
-    virtual ~extrudePatchMesh();
+    virtual ~extrudePatchMesh() = default;
 
 
     // Member functions
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
index 0dac84ea7e..b3aa15ff3f 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
@@ -87,6 +87,7 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::fvMeshAdder::add
             validBoundary
         )
     );
+    mapAddedPolyMesh& map = *mapPtr;
 
     // Adjust the fvMesh part.
     const polyBoundaryMesh& patches = mesh0.boundaryMesh();
@@ -100,23 +101,23 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::fvMeshAdder::add
 
     // Do the mapping of the stored fields
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    fvMeshAdder::MapVolFields<scalar>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapVolFields<vector>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapVolFields<sphericalTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapVolFields<symmTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapVolFields<tensor>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapVolFields<scalar>(map, mesh0, mesh1);
+    fvMeshAdder::MapVolFields<vector>(map, mesh0, mesh1);
+    fvMeshAdder::MapVolFields<sphericalTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapVolFields<symmTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapVolFields<tensor>(map, mesh0, mesh1);
 
-    fvMeshAdder::MapSurfaceFields<scalar>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapSurfaceFields<vector>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapSurfaceFields<sphericalTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapSurfaceFields<symmTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapSurfaceFields<tensor>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapSurfaceFields<scalar>(map, mesh0, mesh1);
+    fvMeshAdder::MapSurfaceFields<vector>(map, mesh0, mesh1);
+    fvMeshAdder::MapSurfaceFields<sphericalTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapSurfaceFields<symmTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapSurfaceFields<tensor>(map, mesh0, mesh1);
 
-    fvMeshAdder::MapDimFields<scalar>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapDimFields<vector>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapDimFields<sphericalTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapDimFields<symmTensor>(mapPtr, mesh0, mesh1);
-    fvMeshAdder::MapDimFields<tensor>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<scalar>(map, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<vector>(map, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<sphericalTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<symmTensor>(map, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<tensor>(map, mesh0, mesh1);
 
     return mapPtr;
 }
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 355c833349..beb3af4346 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -632,7 +632,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
     // shared points (see mergeSharedPoints below). So temporarily points
     // and edges do not match!
 
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields. No inflation, parallel sync.
     mesh_.updateMesh(map);
@@ -647,16 +648,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
 
 
     // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        mesh_.movePoints(map().preMotionPoints());
+        mesh_.movePoints(map.preMotionPoints());
     }
 
     // Adapt constructMaps.
 
     if (debug)
     {
-        label index = map().reverseFaceMap().find(-1);
+        label index = map.reverseFaceMap().find(-1);
 
         if (index != -1)
         {
@@ -672,14 +673,14 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
     {
         inplaceRenumberWithFlip
         (
-            map().reverseFaceMap(),
+            map.reverseFaceMap(),
             false,
             true,
             constructFaceMap[proci]
         );
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -706,7 +707,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
 
     if (returnReduce(pointToMaster.size(), sumOp<label>()) == 0)
     {
-        return autoPtr<mapPolyMesh>(nullptr);
+        return autoPtr<mapPolyMesh>();
     }
 
     polyTopoChange meshMod(mesh_);
@@ -714,7 +715,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
     fvMeshAdder::mergePoints(mesh_, pointToMaster, meshMod);
 
     // Change the mesh (no inflation). Note: parallel comms allowed.
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields. No inflation, parallel sync.
     mesh_.updateMesh(map);
@@ -728,7 +730,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
         {
             label oldPointi = constructMap[i];
 
-            label newPointi = map().reversePointMap()[oldPointi];
+            label newPointi = map.reversePointMap()[oldPointi];
 
             if (newPointi < -1)
             {
@@ -746,7 +748,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
             }
         }
     }
-    return map;
+
+    return mapPtr;
 }
 
 
@@ -1124,7 +1127,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::doRemoveCells
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, false);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.updateMesh(map());
 
 
     // Any exposed faces in a surfaceField will not be mapped. Map the value
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index dfb166aeb9..5e83a25098 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -1488,7 +1488,7 @@ const fvMesh& Foam::fvMeshSubset::subMesh() const
 {
     checkCellSubset();
 
-    return fvMeshSubsetPtr_();
+    return *fvMeshSubsetPtr_;
 }
 
 
@@ -1496,7 +1496,7 @@ fvMesh& Foam::fvMeshSubset::subMesh()
 {
     checkCellSubset();
 
-    return fvMeshSubsetPtr_();
+    return *fvMeshSubsetPtr_;
 }
 
 
@@ -1550,7 +1550,7 @@ const labelList& Foam::fvMeshSubset::faceFlipMap() const
         }
     }
 
-    return faceFlipMapPtr_();
+    return *faceFlipMapPtr_;
 }
 
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index 90dbd212ff..a59db7a54d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -575,7 +575,7 @@ public:
                 {
                     calcFaceCuts();
                 }
-                return faceCutsPtr_();
+                return *faceCutsPtr_;
             }
 
             //- Gives for split face the two cuts that split the face into two.
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index 065edef71f..02ade8a438 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -145,7 +145,7 @@ public:
         autoPtr<cellLooper> clone() const
         {
             NotImplemented;
-            return autoPtr<cellLooper>(nullptr);
+            return autoPtr<cellLooper>();
         }
 
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 83fdea8410..0b4c3c9043 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -452,7 +452,7 @@ void Foam::multiDirRefinement::refineFromDict
     // How to walk cell circumference.
     Switch pureGeomCut(dict.lookup("geometricCut"));
 
-    autoPtr<cellLooper> cellWalker(nullptr);
+    autoPtr<cellLooper> cellWalker;
     if (pureGeomCut)
     {
         cellWalker.reset(new geomCellLooper(mesh));
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index 8604300226..e7460ee9dd 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -146,7 +146,7 @@ solidBodyMotionDisplacementPointPatchVectorField::localPoints0() const
 
         localPoints0Ptr_.reset(new pointField(points0, patch().meshPoints()));
     }
-    return localPoints0Ptr_();
+    return *localPoints0Ptr_;
 }
 
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
index 0709072491..c8f349a6aa 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
@@ -142,7 +142,7 @@ public:
             //- Return the fluctuation scale
             const solidBodyMotionFunction& motion() const
             {
-                return SBMFPtr_();
+                return *SBMFPtr_;
             }
 
             const pointField& localPoints0() const;
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 6e5decf035..7efaf9cd5b 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -92,7 +92,7 @@ Foam::motionSolver::motionSolver
 Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::clone() const
 {
     NotImplemented;
-    return autoPtr<motionSolver>(nullptr);
+    return autoPtr<motionSolver>();
 }
 
 
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index b5d7b1fe28..e406bb852f 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -441,19 +441,19 @@ public:
             //- Addressing engine for coupled faces on mesh0
             const indirectPrimitivePatch& masterPatch() const
             {
-                return masterPatchPtr_();
+                return *masterPatchPtr_;
             }
 
             //- Addressing engine for coupled faces on mesh1
             const indirectPrimitivePatch& slavePatch() const
             {
-                return slavePatchPtr_();
+                return *slavePatchPtr_;
             }
 
             //- Addressing engine for combined set of faces.
             const primitiveFacePatch& cutFaces() const
             {
-                return cutFacesPtr_();
+                return *cutFacesPtr_;
             }
 
             //- Points for combined set of faces.
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 1f87a21ef1..863d7dfeb9 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -5110,7 +5110,7 @@ const Foam::cellShapeList& Foam::hexRef8::cellShapes() const
                 << endl;
         }
     }
-    return cellShapesPtr_();
+    return *cellShapesPtr_;
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index ee40ecc48a..2d9f9ecf55 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -286,7 +286,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChanger::changeMesh
     else
     {
         mesh_.topoChanging(false);
-        return autoPtr<mapPolyMesh>(nullptr);
+        return autoPtr<mapPolyMesh>();
     }
 }
 
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
index 2de1c3619a..2ccb4da9ca 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
@@ -43,7 +43,7 @@ Foam::polyTopoChange& Foam::repatchPolyTopoChanger::meshMod()
     {
         meshModPtr_.reset(new polyTopoChange(mesh_));
     }
-    return meshModPtr_();
+    return *meshModPtr_;
 }
 
 
diff --git a/src/engine/enginePiston/enginePiston.H b/src/engine/enginePiston/enginePiston.H
index 5904ce36f3..1cf9c5bde7 100644
--- a/src/engine/enginePiston/enginePiston.H
+++ b/src/engine/enginePiston/enginePiston.H
@@ -120,7 +120,7 @@ public:
         //- Return coordinate system
         const coordinateSystem& cs() const
         {
-            return csPtr_();
+            return *csPtr_;
         }
 
         //- Return ID of piston patch
diff --git a/src/engine/engineValve/engineValve.H b/src/engine/engineValve/engineValve.H
index 069257badb..be702aa9e8 100644
--- a/src/engine/engineValve/engineValve.H
+++ b/src/engine/engineValve/engineValve.H
@@ -197,7 +197,7 @@ public:
         //- Return coordinate system
         const coordinateSystem& cs() const
         {
-            return csPtr_();
+            return *csPtr_;
         }
 
         //- Return lift profile
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index cc18a818b4..236bef7837 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -174,7 +174,7 @@ public:
         autoPtr<MRFZone> clone() const
         {
             NotImplemented;
-            return autoPtr<MRFZone>(nullptr);
+            return autoPtr<MRFZone>();
         }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
index cab1112368..45be00daa8 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
@@ -133,7 +133,7 @@ public:
         autoPtr<option> clone() const
         {
             NotImplemented;
-            return autoPtr<option>(nullptr);
+            return autoPtr<option>();
         }
 
         //- Return pointer to new fvOption object created
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 4ca403cdf0..d2d4305376 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -101,7 +101,7 @@ Foam::porosityModel::porosityModel
     active_(true),
     zoneName_(cellZoneName),
     cellZoneIDs_(),
-    coordSys_(coordinateSystem::New(mesh, coeffs_))
+    coordSys_(*(coordinateSystem::New(mesh, coeffs_)))
 {
     if (zoneName_ == word::null)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 513056ab6b..95c50f56aa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -283,7 +283,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
             ).ptr()
         );
     }
-    return redirectPatchFieldPtr_();
+    return *redirectPatchFieldPtr_;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
index d122e90f89..f03e966e15 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
@@ -291,7 +291,7 @@ Foam::codedMixedFvPatchField<Type>::redirectPatchField() const
             )
         );
     }
-    return redirectPatchFieldPtr_();
+    return *redirectPatchFieldPtr_;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 31a67024a5..6e053a21e2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -60,9 +60,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    rpm_(ptf.rpm_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
@@ -92,9 +92,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    rpm_(ptf.rpm_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
@@ -108,9 +108,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, iF),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    rpm_(ptf.rpm_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index 648b716966..7ff37d287e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -65,7 +65,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    meanValue_(ptf.meanValue_, false)
+    meanValue_(ptf.meanValue_.clone())
 {}
 
 
@@ -76,7 +76,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    meanValue_(ptf.meanValue_, false)
+    meanValue_(ptf.meanValue_.clone())
 {}
 
 
@@ -88,7 +88,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    meanValue_(ptf.meanValue_, false)
+    meanValue_(ptf.meanValue_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 1deba5890f..0d97a44926 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -94,7 +94,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),  // Don't map
-    profile_(ptf.profile_, false),
+    profile_(ptf.profile_.clone()),
     dir_(ptf.dir_),
     origin_(ptf.origin_)
 {
@@ -110,7 +110,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    profile_(ptf.profile_, false),
+    profile_(ptf.profile_.clone()),
     dir_(ptf.dir_),
     origin_(ptf.origin_)
 {}
@@ -124,7 +124,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    profile_(ptf.profile_, false),
+    profile_(ptf.profile_.clone()),
     dir_(ptf.dir_),
     origin_(ptf.origin_)
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index f40f399ad3..5f4122b704 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -107,7 +107,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_),
@@ -122,7 +122,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_),
@@ -138,7 +138,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index ed9d095a2a..88e9c9848c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -102,7 +102,7 @@ flowRateOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoOutlet_(ptf.rhoOutlet_)
@@ -116,7 +116,7 @@ flowRateOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoOutlet_(ptf.rhoOutlet_)
@@ -131,7 +131,7 @@ flowRateOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoOutlet_(ptf.rhoOutlet_)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index edaca467e2..39532ed2f0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -71,7 +71,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper),
-    omega_(ptf.omega_, false)
+    omega_(ptf.omega_.clone())
 {
     calcTangentialVelocity();
 }
@@ -100,7 +100,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(rppvf),
-    omega_(rppvf.omega_, false)
+    omega_(rppvf.omega_.clone())
 {
     calcTangentialVelocity();
 }
@@ -114,7 +114,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(rppvf, iF),
-    omega_(rppvf.omega_, false)
+    omega_(rppvf.omega_.clone())
 {
     calcTangentialVelocity();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
index ddb6cc5df4..c46d3b6edb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H
@@ -38,7 +38,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | flux field name         | no          | phi
         tangentialVelocity | tangential velocity field | no  |
-        omega        | angular velocty of the frame [rad/s] | yes    |
+        omega        | angular velocity of the frame [rad/s] | yes    |
     \endtable
 
     Example of the boundary condition specification:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 5d1df66c79..c5fdd78639 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -53,7 +53,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(ptf, p, iF, mapper),
-    omega_(ptf.omega_, false)
+    omega_(ptf.omega_.clone())
 {}
 
 
@@ -77,7 +77,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(rtppsf),
-    omega_(rtppsf.omega_, false)
+    omega_(rtppsf.omega_.clone())
 {}
 
 
@@ -89,7 +89,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(rtppsf, iF),
-    omega_(rtppsf.omega_, false)
+    omega_(rtppsf.omega_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index d322862f4a..c35b7a3c3f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -40,7 +40,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF),
     origin_(),
     axis_(Zero),
-    omega_(0)
+    omega_(nullptr)
 {}
 
 
@@ -84,7 +84,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    omega_(ptf.omega_, false)
+    omega_(ptf.omega_.clone())
 {}
 
 
@@ -97,7 +97,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(rwvpvf),
     origin_(rwvpvf.origin_),
     axis_(rwvpvf.axis_),
-    omega_(rwvpvf.omega_, false)
+    omega_(rwvpvf.omega_.clone())
 {}
 
 
@@ -111,7 +111,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(rwvpvf, iF),
     origin_(rwvpvf.origin_),
     axis_(rwvpvf.axis_),
-    omega_(rwvpvf.omega_, false)
+    omega_(rwvpvf.omega_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index cba888cc6b..ebe4ebdd58 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -99,8 +99,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     rhoName_(ptf.rhoName_),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    flowRate_(ptf.flowRate_, false),
-    rpm_(ptf.rpm_, false)
+    flowRate_(ptf.flowRate_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
@@ -115,8 +115,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     rhoName_(ptf.rhoName_),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    flowRate_(ptf.flowRate_, false),
-    rpm_(ptf.rpm_, false)
+    flowRate_(ptf.flowRate_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
@@ -132,8 +132,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     rhoName_(ptf.rhoName_),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    flowRate_(ptf.flowRate_, false),
-    rpm_(ptf.rpm_, false)
+    flowRate_(ptf.flowRate_.clone()),
+    rpm_(ptf.rpm_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 4b76142d9f..21c42908dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -56,9 +56,9 @@ swirlInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    tangentialVelocity_(ptf.tangentialVelocity_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    tangentialVelocity_(ptf.tangentialVelocity_.clone())
 {}
 
 
@@ -88,9 +88,9 @@ swirlInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    tangentialVelocity_(ptf.tangentialVelocity_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    tangentialVelocity_(ptf.tangentialVelocity_.clone())
 {}
 
 
@@ -104,9 +104,9 @@ swirlInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, iF),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_, false),
-    radialVelocity_(ptf.radialVelocity_, false),
-    tangentialVelocity_(ptf.tangentialVelocity_, false)
+    axialVelocity_(ptf.axialVelocity_.clone()),
+    radialVelocity_(ptf.radialVelocity_.clone()),
+    tangentialVelocity_(ptf.tangentialVelocity_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index af626c2c5e..0d0e4e0a21 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -141,7 +141,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(Zero),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
@@ -165,7 +165,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
@@ -190,7 +190,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index d41a424701..b9cb8fa6a5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -37,7 +37,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    U_(0)
+    U_(nullptr)
 {}
 
 
@@ -67,7 +67,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    U_(ptf.U_, false)
+    U_(ptf.U_.clone())
 {}
 
 
@@ -78,7 +78,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(twvpvf),
-    U_(twvpvf.U_, false)
+    U_(twvpvf.U_.clone())
 {}
 
 
@@ -90,7 +90,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(twvpvf, iF),
-    U_(twvpvf.U_, false)
+    U_(twvpvf.U_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 22cd511d18..a23ffef19f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -235,7 +235,7 @@ Foam::turbulentDFSEMInletFvPatchVectorField::patchMapper() const
         );
     }
 
-    return mapperPtr_();
+    return *mapperPtr_;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index 1bf1f7b081..c08fd07f3d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -78,7 +78,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf, p, iF, mapper),
-    uniformGradient_(ptf.uniformGradient_, false)
+    uniformGradient_(ptf.uniformGradient_.clone())
 {}
 
 
@@ -89,7 +89,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf),
-    uniformGradient_(ptf.uniformGradient_, false)
+    uniformGradient_(ptf.uniformGradient_.clone())
 {}
 
 
@@ -101,7 +101,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf, iF),
-    uniformGradient_(ptf.uniformGradient_, false)
+    uniformGradient_(ptf.uniformGradient_.clone())
 {
     // Evaluate the profile if defined
     if (ptf.uniformGradient_.valid())
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index e79df9bec0..dc4d7c8a93 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -77,7 +77,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),   // Don't map
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {
     // Evaluate since value not mapped
     this->evaluate();
@@ -91,7 +91,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {}
 
 
@@ -103,7 +103,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    uniformValue_(ptf.uniformValue_, false)
+    uniformValue_(ptf.uniformValue_.clone())
 {
     // Evaluate the profile if defined
     if (ptf.uniformValue_.valid())
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 647398f4b0..28f623544d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -87,7 +87,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(p, iF),  // Don't map
     phiName_(ptf.phiName_),
-    uniformInletValue_(ptf.uniformInletValue_, false)
+    uniformInletValue_(ptf.uniformInletValue_.clone())
 {
     this->patchType() = ptf.patchType();
 
@@ -113,7 +113,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(ptf),
     phiName_(ptf.phiName_),
-    uniformInletValue_(ptf.uniformInletValue_, false)
+    uniformInletValue_(ptf.uniformInletValue_.clone())
 {}
 
 
@@ -126,7 +126,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(ptf, iF),
     phiName_(ptf.phiName_),
-    uniformInletValue_(ptf.uniformInletValue_, false)
+    uniformInletValue_(ptf.uniformInletValue_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index 31350e6230..67e199cf42 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -49,7 +49,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
@@ -90,7 +90,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
@@ -102,7 +102,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf, iF),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 033afb572a..acf0f8358d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -49,7 +49,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
@@ -87,7 +87,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
@@ -99,7 +99,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf, iF),
-    jumpTable_(ptf.jumpTable_, false)
+    jumpTable_(ptf.jumpTable_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index ea3c1705c6..eee8af784c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -94,7 +94,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    p0_(ptf.p0_, false)
+    p0_(ptf.p0_.clone())
 {
     patchType() = ptf.patchType();
 
@@ -117,7 +117,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    p0_(ptf.p0_, false)
+    p0_(ptf.p0_.clone())
 {}
 
 
@@ -134,7 +134,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    p0_(ptf.p0_, false)
+    p0_(ptf.p0_.clone())
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 40a7ce65d9..56f99f5067 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -66,7 +66,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     alphaName_(ptf.alphaName_)
 {}
 
@@ -78,7 +78,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     alphaName_(ptf.alphaName_)
 {}
 
@@ -91,7 +91,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_, false),
+    flowRate_(ptf.flowRate_.clone()),
     alphaName_(ptf.alphaName_)
 {}
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index a8632062e4..f6e4482031 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -320,10 +320,9 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
                 << exit(FatalIOError);
         }
 
-        ocCoeff_ = new Function1Types::Constant<scalar>
+        ocCoeff_.reset
         (
-            "ocCoeff",
-            ocCoeff
+            new Function1Types::Constant<scalar>("ocCoeff", ocCoeff)
         );
     }
     else
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index b38e535941..68a0256bf5 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -86,7 +86,7 @@ public:
         //- Return reference to the parallel distribution map
         const mapDistribute& map() const
         {
-            return mapPtr_();
+            return *mapPtr_;
         }
 
         //- Return reference to the stencil
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
index f1a7ce9eba..5db34ecacf 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H
@@ -85,7 +85,7 @@ public:
         //- Return reference to the parallel distribution map
         const mapDistribute& map() const
         {
-            return mapPtr_();
+            return *mapPtr_;
         }
 
         //- Return reference to the stencil
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
index 1ce6ca1209..67824801c3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H
@@ -152,13 +152,13 @@ public:
         //- Return reference to the parallel distribution map
         const mapDistribute& ownMap() const
         {
-            return ownMapPtr_();
+            return *ownMapPtr_;
         }
 
         //- Return reference to the parallel distribution map
         const mapDistribute& neiMap() const
         {
-            return neiMapPtr_();
+            return *neiMapPtr_;
         }
 
         //- Return reference to the stencil
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
index 3e3f01f50e..0c6d6beb01 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
@@ -85,7 +85,7 @@ public:
         //- Return reference to the parallel distribution map
         const mapDistribute& map() const
         {
-            return mapPtr_();
+            return *mapPtr_;
         }
 
         //- Return reference to the stencil
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index d6a49bcce5..d5730ec1ba 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -75,7 +75,7 @@ Foam::functionObjects::streamLineBase::sampledSetPoints() const
         sampledSetAxis_ = sampledSetPtr_->axis();
     }
 
-    return sampledSetPtr_();
+    return *sampledSetPtr_;
 }
 
 
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index 51917aa554..8e2c1c1ffb 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -162,7 +162,7 @@ Foam::functionObjects::codedFunctionObject::redirectFunctionObject() const
             constructDict
         );
     }
-    return redirectFunctionObjectPtr_();
+    return *redirectFunctionObjectPtr_;
 }
 
 
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.H b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
index 0386625fb6..0d61f4dfab 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.H
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.H
@@ -140,13 +140,13 @@ class ensightWrite
         //- Ensight case handler
         ensightCase& ensCase()
         {
-            return ensCase_();
+            return *ensCase_;
         }
 
         //- Ensight mesh handler
         ensightMesh& ensMesh()
         {
-            return ensMesh_();
+            return *ensMesh_;
         }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index bb03b88838..7bd9737556 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -130,7 +130,7 @@ public:
         //- Return diffusivity
         motionDiffusivity& diffusivity()
         {
-            return diffusivityPtr_();
+            return *diffusivityPtr_;
         }
 
         //- Return point location obtained from the current motion field
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 96d035e68a..b656a35573 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -253,7 +253,8 @@ Foam::displacementLaplacianFvMotionSolver::diffusivity()
             coeffDict().lookup("diffusivity")
         );
     }
-    return diffusivityPtr_();
+
+    return *diffusivityPtr_;
 }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
index 277593506b..cd6fb4caf7 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
@@ -258,7 +258,8 @@ Foam::solidBodyDisplacementLaplacianFvMotionSolver::diffusivity()
             coeffDict().lookup("diffusivity")
         );
     }
-    return diffusivityPtr_();
+
+    return *diffusivityPtr_;
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 5e2053ef99..3d0f31a446 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -411,7 +411,8 @@ Foam::surfaceDisplacementPointPatchVectorField::surfaces() const
             )
         );
     }
-    return surfacesPtr_();
+
+    return *surfacesPtr_;
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 469cebfb79..2f3de5ce6a 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -397,7 +397,8 @@ Foam::surfaceSlipDisplacementPointPatchVectorField::surfaces() const
             )
         );
     }
-    return surfacesPtr_();
+
+    return *surfacesPtr_;
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 1fbcb49f96..93025bfbd1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -146,7 +146,7 @@ timeVaryingMappedFixedValuePointPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(Zero),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
@@ -170,7 +170,7 @@ timeVaryingMappedFixedValuePointPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
@@ -195,7 +195,7 @@ timeVaryingMappedFixedValuePointPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_(ptf.offset_, false)
+    offset_(ptf.offset_.clone())
 {}
 
 
diff --git a/src/fvOptions/interRegionOption/interRegionOptionI.H b/src/fvOptions/interRegionOption/interRegionOptionI.H
index 738b699346..55d0aa941c 100644
--- a/src/fvOptions/interRegionOption/interRegionOptionI.H
+++ b/src/fvOptions/interRegionOption/interRegionOptionI.H
@@ -42,7 +42,7 @@ Foam::fv::interRegionOption::meshInterp() const
             << abort(FatalError);
     }
 
-    return meshInterpPtr_();
+    return *meshInterpPtr_;
 }
 
 
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 7a7a8ccde7..963c0c72fe 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -63,7 +63,7 @@ const Foam::coordinateSystem& Foam::fv::jouleHeatingSource::coordSys() const
             << abort(FatalError);
     }
 
-    return coordSysPtr_();
+    return *coordSysPtr_;
 }
 
 
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 2ea05cf09a..567e7d666e 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -143,7 +143,7 @@ Foam::fv::option& Foam::fv::CodedSource<Type>::redirectFvOption() const
             mesh_
         );
     }
-    return redirectFvOptionPtr_();
+    return *redirectFvOptionPtr_;
 }
 
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
index c9a57a05d1..4fd5ded0fb 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
@@ -42,14 +42,14 @@ Foam::fv::interRegionHeatTransferModel::meshInterp() const
             << abort(FatalError);
     }
 
-    return meshInterpPtr_();
+    return *meshInterpPtr_;
 }
 
 
 inline const Foam::volScalarField&
 Foam::fv::interRegionHeatTransferModel::htc() const
 {
-    return  htc_;
+    return htc_;
 }
 
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index 86de071e8f..4362a4065a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
@@ -53,7 +53,7 @@ Foam::fv::tabulatedHeatTransfer::hTable()
         hTable_.reset(new interpolation2DTable<scalar>(coeffs_));
     }
 
-    return hTable_();
+    return *hTable_;
 }
 
 
@@ -78,7 +78,7 @@ const Foam::volScalarField& Foam::fv::tabulatedHeatTransfer::AoV()
         );
     }
 
-    return AoV_();
+    return *AoV_;
 }
 
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index 2ba95833c1..7bb32e152b 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -64,7 +64,7 @@ Foam::fv::tabulatedNTUHeatTransfer::ntuTable()
         ntuTable_.reset(new interpolation2DTable<scalar>(coeffs_));
     }
 
-    return ntuTable_();
+    return *ntuTable_;
 }
 
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
index 7fe1bc1a30..d1d6744174 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@@ -89,12 +89,6 @@ Foam::fv::variableHeatTransfer::variableHeatTransfer
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::fv::variableHeatTransfer::~variableHeatTransfer()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::fv::variableHeatTransfer::calculateHtc()
@@ -122,7 +116,7 @@ void Foam::fv::variableHeatTransfer::calculateHtc()
 
     const scalarField htcNbrMapped(interpolate(htcNbr));
 
-    htc_.primitiveFieldRef() = htcNbrMapped*AoV_;
+    htc_.primitiveFieldRef() = htcNbrMapped * AoV_();
 }
 
 
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
index e639fc0792..e580cdae20 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H
@@ -105,7 +105,7 @@ public:
 
 
     //- Destructor
-    virtual ~variableHeatTransfer();
+    virtual ~variableHeatTransfer() = default;
 
 
     // Public Functions
@@ -113,11 +113,8 @@ public:
         //- Calculate the heat transfer coefficient
         virtual void calculateHtc();
 
-
-        // IO
-
-            //- Read dictionary
-            virtual bool read(const dictionary& dict) ;
+        //- Read dictionary
+        virtual bool read(const dictionary& dict);
 };
 
 
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 38c9fd3a39..5d4d63f279 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -216,7 +216,7 @@ template<class ParcelType>
 inline Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::binaryCollision()
 {
-    return binaryCollisionModel_();
+    return *binaryCollisionModel_;
 }
 
 
@@ -224,7 +224,7 @@ template<class ParcelType>
 inline const Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::wallInteraction() const
 {
-    return wallInteractionModel_;
+    return *wallInteractionModel_;
 }
 
 
@@ -232,7 +232,7 @@ template<class ParcelType>
 inline Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::wallInteraction()
 {
-    return wallInteractionModel_();
+    return *wallInteractionModel_;
 }
 
 
@@ -240,7 +240,7 @@ template<class ParcelType>
 inline const Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::inflowBoundary() const
 {
-    return inflowBoundaryModel_;
+    return *inflowBoundaryModel_;
 }
 
 
@@ -248,7 +248,7 @@ template<class ParcelType>
 inline Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType>>&
 Foam::DSMCCloud<ParcelType>::inflowBoundary()
 {
-    return inflowBoundaryModel_();
+    return *inflowBoundaryModel_;
 }
 
 
diff --git a/src/lagrangian/basic/InteractionLists/InteractionListsI.H b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
index 979367cd37..6882cc9d80 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionListsI.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
@@ -38,7 +38,7 @@ template<class ParticleType>
 const Foam::mapDistribute&
 Foam::InteractionLists<ParticleType>::cellMap() const
 {
-    return cellMapPtr_();
+    return *cellMapPtr_;
 }
 
 
@@ -46,7 +46,7 @@ template<class ParticleType>
 const Foam::mapDistribute&
 Foam::InteractionLists<ParticleType>::wallFaceMap() const
 {
-    return wallFaceMapPtr_();
+    return *wallFaceMapPtr_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
index cb4ec402a1..d5320d44fe 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloudI.H
@@ -29,7 +29,7 @@ template<class CloudType>
 inline const Foam::CollidingCloud<CloudType>&
 Foam::CollidingCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -45,7 +45,7 @@ template<class CloudType>
 inline const Foam::CollisionModel<Foam::CollidingCloud<CloudType>>&
 Foam::CollidingCloud<CloudType>::collision() const
 {
-    return collisionModel_();
+    return *collisionModel_;
 }
 
 
@@ -53,7 +53,7 @@ template<class CloudType>
 inline Foam::CollisionModel<Foam::CollidingCloud<CloudType>>&
 Foam::CollidingCloud<CloudType>::collision()
 {
-    return collisionModel_();
+    return *collisionModel_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 3e229fa1e6..84c7b85315 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -539,13 +539,6 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::KinematicCloud<CloudType>::~KinematicCloud()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 4b93cd3329..fdfb60c087 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -325,7 +325,7 @@ public:
 
 
     //- Destructor
-    virtual ~KinematicCloud();
+    virtual ~KinematicCloud() = default;
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index f5ac343730..bdb245e6e5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -32,7 +32,7 @@ template<class CloudType>
 inline const Foam::KinematicCloud<CloudType>&
 Foam::KinematicCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -192,7 +192,7 @@ template<class CloudType>
 inline const Foam::DispersionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::dispersion() const
 {
-    return dispersionModel_;
+    return *dispersionModel_;
 }
 
 
@@ -200,7 +200,7 @@ template<class CloudType>
 inline Foam::DispersionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::dispersion()
 {
-    return dispersionModel_();
+    return *dispersionModel_;
 }
 
 
@@ -208,7 +208,7 @@ template<class CloudType>
 inline const Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::patchInteraction() const
 {
-    return patchInteractionModel_;
+    return *patchInteractionModel_;
 }
 
 
@@ -216,7 +216,7 @@ template<class CloudType>
 inline Foam::PatchInteractionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::patchInteraction()
 {
-    return patchInteractionModel_();
+    return *patchInteractionModel_;
 }
 
 
@@ -224,7 +224,7 @@ template<class CloudType>
 inline const Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::stochasticCollision() const
 {
-    return stochasticCollisionModel_();
+    return *stochasticCollisionModel_;
 }
 
 
@@ -232,7 +232,7 @@ template<class CloudType>
 inline Foam::StochasticCollisionModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::stochasticCollision()
 {
-    return stochasticCollisionModel_();
+    return *stochasticCollisionModel_;
 }
 
 
@@ -240,7 +240,7 @@ template<class CloudType>
 inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::surfaceFilm() const
 {
-    return surfaceFilmModel_();
+    return *surfaceFilmModel_;
 }
 
 
@@ -248,7 +248,7 @@ template<class CloudType>
 inline Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType>>&
 Foam::KinematicCloud<CloudType>::surfaceFilm()
 {
-    return surfaceFilmModel_();
+    return *surfaceFilmModel_;
 }
 
 
@@ -256,7 +256,7 @@ template<class CloudType>
 inline const Foam::vectorIntegrationScheme&
 Foam::KinematicCloud<CloudType>::UIntegrator() const
 {
-    return UIntegrator_;
+    return *UIntegrator_;
 }
 
 
@@ -371,7 +371,7 @@ Foam::KinematicCloud<CloudType>::cellOccupancy()
         buildCellOccupancy();
     }
 
-    return cellOccupancyPtr_();
+    return *cellOccupancyPtr_;
 }
 
 
@@ -387,7 +387,7 @@ template<class CloudType>
 inline Foam::DimensionedField<Foam::vector, Foam::volMesh>&
 Foam::KinematicCloud<CloudType>::UTrans()
 {
-    return UTrans_();
+    return *UTrans_;
 }
 
 
@@ -395,7 +395,7 @@ template<class CloudType>
 inline const Foam::DimensionedField<Foam::vector, Foam::volMesh>&
 Foam::KinematicCloud<CloudType>::UTrans() const
 {
-    return UTrans_();
+    return *UTrans_;
 }
 
 
@@ -403,7 +403,7 @@ template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::KinematicCloud<CloudType>::UCoeff()
 {
-    return UCoeff_();
+    return *UCoeff_;
 }
 
 
@@ -411,7 +411,7 @@ template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::KinematicCloud<CloudType>::UCoeff() const
 {
-    return UCoeff_();
+    return *UCoeff_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
index 7d8dee80b9..ee65971bf9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloudI.H
@@ -29,7 +29,7 @@ template<class CloudType>
 inline const Foam::MPPICCloud<CloudType>&
 Foam::MPPICCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -37,7 +37,7 @@ template<class CloudType>
 inline const Foam::PackingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::packingModel() const
 {
-    return packingModel_();
+    return *packingModel_;
 }
 
 
@@ -45,7 +45,7 @@ template<class CloudType>
 inline Foam::PackingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::packingModel()
 {
-    return packingModel_();
+    return *packingModel_;
 }
 
 
@@ -53,7 +53,7 @@ template<class CloudType>
 inline const Foam::DampingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::dampingModel() const
 {
-    return dampingModel_();
+    return *dampingModel_;
 }
 
 
@@ -61,7 +61,7 @@ template<class CloudType>
 inline Foam::DampingModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::dampingModel()
 {
-    return dampingModel_();
+    return *dampingModel_;
 }
 
 
@@ -69,7 +69,7 @@ template<class CloudType>
 inline const Foam::IsotropyModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::isotropyModel() const
 {
-    return isotropyModel_();
+    return *isotropyModel_;
 }
 
 
@@ -77,7 +77,7 @@ template<class CloudType>
 inline Foam::IsotropyModel<Foam::MPPICCloud<CloudType>>&
 Foam::MPPICCloud<CloudType>::isotropyModel()
 {
-    return isotropyModel_();
+    return *isotropyModel_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index fc52c1abaf..ffb70989bc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -203,13 +203,6 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::ReactingCloud<CloudType>::~ReactingCloud()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index bfb0952677..22ab3b5b38 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -195,7 +195,7 @@ public:
 
 
     //- Destructor
-    virtual ~ReactingCloud();
+    virtual ~ReactingCloud() = default;
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 667cff55fd..7aa240ba2a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -29,7 +29,7 @@ template<class CloudType>
 inline const Foam::ReactingCloud<CloudType>&
 Foam::ReactingCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -53,7 +53,7 @@ template<class CloudType>
 inline const Foam::CompositionModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::composition() const
 {
-    return compositionModel_;
+    return *compositionModel_;
 }
 
 
@@ -61,7 +61,7 @@ template<class CloudType>
 inline const Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::phaseChange() const
 {
-    return phaseChangeModel_;
+    return *phaseChangeModel_;
 }
 
 
@@ -69,7 +69,7 @@ template<class CloudType>
 inline Foam::PhaseChangeModel<Foam::ReactingCloud<CloudType>>&
 Foam::ReactingCloud<CloudType>::phaseChange()
 {
-    return phaseChangeModel_();
+    return *phaseChangeModel_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index c7aa0e4aaf..20816c1f19 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -29,7 +29,7 @@ template<class CloudType>
 inline const Foam::ReactingMultiphaseCloud<CloudType>&
 Foam::ReactingMultiphaseCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -67,7 +67,7 @@ inline Foam::DevolatilisationModel
 >&
 Foam::ReactingMultiphaseCloud<CloudType>::devolatilisation()
 {
-    return devolatilisationModel_();
+    return *devolatilisationModel_;
 }
 
 
@@ -89,7 +89,7 @@ inline Foam::SurfaceReactionModel
 >&
 Foam::ReactingMultiphaseCloud<CloudType>::surfaceReaction()
 {
-    return surfaceReactionModel_();
+    return *surfaceReactionModel_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 2f1248ae2f..85e26f49db 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -346,13 +346,6 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::ThermoCloud<CloudType>::~ThermoCloud()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index fa99a67d86..c2111c4617 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -214,7 +214,7 @@ public:
 
 
     //- Destructor
-    virtual ~ThermoCloud();
+    virtual ~ThermoCloud() = default;
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index e61c2e9901..d36a15421b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -33,7 +33,7 @@ template<class CloudType>
 inline const Foam::ThermoCloud<CloudType>&
 Foam::ThermoCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -78,7 +78,7 @@ template<class CloudType>
 inline const Foam::HeatTransferModel<Foam::ThermoCloud<CloudType>>&
 Foam::ThermoCloud<CloudType>::heatTransfer() const
 {
-    return heatTransferModel_;
+    return *heatTransferModel_;
 }
 
 
@@ -86,7 +86,7 @@ template<class CloudType>
 inline const Foam::scalarIntegrationScheme&
 Foam::ThermoCloud<CloudType>::TIntegrator() const
 {
-    return TIntegrator_;
+    return *TIntegrator_;
 }
 
 
@@ -108,7 +108,7 @@ Foam::ThermoCloud<CloudType>::radAreaP()
             << abort(FatalError);
     }
 
-    return radAreaP_();
+    return *radAreaP_;
 }
 
 
@@ -123,7 +123,7 @@ Foam::ThermoCloud<CloudType>::radAreaP() const
             << abort(FatalError);
     }
 
-    return radAreaP_();
+    return *radAreaP_;
 }
 
 
@@ -138,7 +138,7 @@ Foam::ThermoCloud<CloudType>::radT4()
             << abort(FatalError);
     }
 
-    return radT4_();
+    return *radT4_;
 }
 
 
@@ -153,7 +153,7 @@ Foam::ThermoCloud<CloudType>::radT4() const
             << abort(FatalError);
     }
 
-    return radT4_();
+    return *radT4_;
 }
 
 
@@ -168,7 +168,7 @@ Foam::ThermoCloud<CloudType>::radAreaPT4()
             << abort(FatalError);
     }
 
-    return radAreaPT4_();
+    return *radAreaPT4_;
 }
 
 
@@ -183,7 +183,7 @@ Foam::ThermoCloud<CloudType>::radAreaPT4() const
             << abort(FatalError);
     }
 
-    return radAreaPT4_();
+    return *radAreaPT4_;
 }
 
 
@@ -191,7 +191,7 @@ template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::ThermoCloud<CloudType>::hsTrans()
 {
-    return hsTrans_();
+    return *hsTrans_;
 }
 
 
@@ -199,7 +199,7 @@ template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::ThermoCloud<CloudType>::hsTrans() const
 {
-    return hsTrans_();
+    return *hsTrans_;
 }
 
 
@@ -207,7 +207,7 @@ template<class CloudType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::ThermoCloud<CloudType>::hsCoeff()
 {
-    return hsCoeff_();
+    return *hsCoeff_;
 }
 
 
@@ -215,7 +215,7 @@ template<class CloudType>
 inline const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::ThermoCloud<CloudType>::hsCoeff() const
 {
-    return hsCoeff_();
+    return *hsCoeff_;
 }
 
 
@@ -388,10 +388,8 @@ inline Foam::scalar Foam::ThermoCloud<CloudType>::Tmax() const
     {
         return T;
     }
-    else
-    {
-        return 0.0;
-    }
+
+    return 0.0;
 }
 
 
@@ -414,10 +412,8 @@ inline Foam::scalar Foam::ThermoCloud<CloudType>::Tmin() const
     {
         return T;
     }
-    else
-    {
-        return 0.0;
-    }
+
+    return 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H
index 72806a9fe3..84f2621009 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H
@@ -68,7 +68,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::KinematicParcel<ParcelType>::trackingData::rhoInterp() const
 {
-    return rhoInterp_();
+    return *rhoInterp_;
 }
 
 
@@ -76,7 +76,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::vector>&
 Foam::KinematicParcel<ParcelType>::trackingData::UInterp() const
 {
-    return UInterp_();
+    return *UInterp_;
 }
 
 
@@ -84,7 +84,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::KinematicParcel<ParcelType>::trackingData::muInterp() const
 {
-    return muInterp_();
+    return *muInterp_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
index 532f22ea7a..b6bf5cd452 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
@@ -186,8 +186,8 @@ inline void Foam::MPPICParcel<ParcelType>::trackingData::updateAverages
     }
     volumeAverage_->average();
     massAverage_->average();
-    rhoAverage_->average(massAverage_);
-    uAverage_->average(massAverage_);
+    rhoAverage_->average(*massAverage_);
+    uAverage_->average(*massAverage_);
 
     // squared velocity deviation
     forAllConstIter(typename TrackCloudType, cloud, iter)
@@ -204,7 +204,7 @@ inline void Foam::MPPICParcel<ParcelType>::trackingData::updateAverages
             p.nParticle()*p.mass()*magSqr(p.U() - u)
         );
     }
-    uSqrAverage_->average(massAverage_);
+    uSqrAverage_->average(*massAverage_);
 
     // sauter mean radius
     radiusAverage_() = volumeAverage_();
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
index 80bccae5d3..964a7f3581 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H
@@ -48,7 +48,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::ReactingParcel<ParcelType>::trackingData::pInterp() const
 {
-    return pInterp_();
+    return *pInterp_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
index 5ea8189bce..0b1c008c5e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
@@ -97,7 +97,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::ThermoParcel<ParcelType>::trackingData::TInterp() const
 {
-    return TInterp_();
+    return *TInterp_;
 }
 
 
@@ -105,7 +105,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::ThermoParcel<ParcelType>::trackingData::CpInterp() const
 {
-    return CpInterp_();
+    return *CpInterp_;
 }
 
 
@@ -113,7 +113,7 @@ template<class ParcelType>
 inline const Foam::interpolation<Foam::scalar>&
 Foam::ThermoParcel<ParcelType>::trackingData::kappaInterp() const
 {
-    return kappaInterp_();
+    return *kappaInterp_;
 }
 
 
@@ -128,7 +128,7 @@ Foam::ThermoParcel<ParcelType>::trackingData::GInterp() const
             << abort(FatalError);
     }
 
-    return GInterp_();
+    return *GInterp_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
index 8e64611fbf..c2fc463222 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
@@ -60,7 +60,7 @@ template<class CloudType>
 inline const Foam::Cloud<typename CloudType::parcelType>&
 Foam::ParticleTracks<CloudType>::cloud() const
 {
-    return cloudPtr_();
+    return *cloudPtr_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index 1e39c9050a..4c38895e32 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -204,7 +204,7 @@ Foam::CellZoneInjection<CloudType>::CellZoneInjection
     injectorTetPts_(im.injectorTetPts_),
     diameters_(im.diameters_),
     U0_(im.U0_),
-    sizeDistribution_(im.sizeDistribution_, false)
+    sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 6651a9573f..d141ce77fe 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -147,7 +147,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     Umag_(im.Umag_),
     thetaInner_(im.thetaInner_),
     thetaOuter_(im.thetaOuter_),
-    sizeDistribution_(im.sizeDistribution_, false),
+    sizeDistribution_(im.sizeDistribution_.clone()),
     nInjected_(im.nInjected_),
     tanVec1_(im.tanVec1_),
     tanVec2_(im.tanVec2_)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 6ac062ee57..4e9e3b3002 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -223,7 +223,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     flowRateProfile_(im.flowRateProfile_),
     thetaInner_(im.thetaInner_),
     thetaOuter_(im.thetaOuter_),
-    sizeDistribution_(im.sizeDistribution_, false),
+    sizeDistribution_(im.sizeDistribution_.clone()),
     tanVec1_(im.tanVec1_),
     tanVec2_(im.tanVec2_),
     normal_(im.normal_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 70daf04625..0c457d1ad8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -119,7 +119,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     nParcelsInjected_(im.nParcelsInjected_),
     U0_(im.U0_),
     diameters_(im.diameters_),
-    sizeDistribution_(im.sizeDistribution_, false)
+    sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 98bd08e71d..aa978877f9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -140,7 +140,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     fraction_(im.fraction_),
     selfSeed_(im.selfSeed_),
     dSeed_(im.dSeed_),
-    sizeDistribution_(im.sizeDistribution_, false)
+    sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 4898bc12da..8a15f16d57 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -97,7 +97,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
     injectorTetFaces_(im.injectorTetFaces_),
     injectorTetPts_(im.injectorTetPts_),
     U0_(im.U0_),
-    sizeDistribution_(im.sizeDistribution_, false),
+    sizeDistribution_(im.sizeDistribution_.clone()),
     ignoreOutOfBounds_(im.ignoreOutOfBounds_)
 {}
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index a7ad2372dd..a9527d0190 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -90,7 +90,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     duration_(im.duration_),
     concentration_(im.concentration_),
     parcelConcentration_(im.parcelConcentration_),
-    sizeDistribution_(im.sizeDistribution_, false)
+    sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index a56d81e3ce..1c9524078e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -84,7 +84,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     parcelsPerSecond_(im.parcelsPerSecond_),
     U0_(im.U0_),
     flowRateProfile_(im.flowRateProfile_),
-    sizeDistribution_(im.sizeDistribution_, false)
+    sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
index 6c4aeab596..dac24d0004 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
@@ -36,7 +36,7 @@ Foam::LiftForce<CloudType>::curlUcInterp() const
             << abort(FatalError);
     }
 
-    return curlUcInterpPtr_();
+    return *curlUcInterpPtr_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
index c9813d8ee0..d13c6be47a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
@@ -36,7 +36,7 @@ Foam::PressureGradientForce<CloudType>::DUcDtInterp() const
             << abort(FatalError);
     }
 
-    return DUcDtInterpPtr_();
+    return *DUcDtInterpPtr_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 946564c1b8..7d6af59b41 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -152,7 +152,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massEscape()
         );
     }
 
-    return massEscapePtr_();
+    return *massEscapePtr_;
 }
 
 
@@ -181,7 +181,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massStick()
         );
     }
 
-    return massStickPtr_();
+    return *massStickPtr_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index c7c18285a3..906c89be7c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -105,13 +105,6 @@ Foam::AveragingMethod<Type>::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::AveragingMethod<Type>::~AveragingMethod()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
index 39e084c9e2..550479e568 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
@@ -130,7 +130,7 @@ public:
 
 
     //- Destructor
-    virtual ~AveragingMethod();
+    virtual ~AveragingMethod() = default;
 
 
     //- Member Functions
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
index bbc44a98b8..f7be290024 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C
@@ -29,15 +29,12 @@ License
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::labelList> Foam::AveragingMethods::Dual<Type>::size
-(
-    const fvMesh& mesh
-)
+Foam::labelList Foam::AveragingMethods::Dual<Type>::sizing(const fvMesh& mesh)
 {
-    autoPtr<labelList> s(new labelList(2));
-    s()[0] = mesh.nCells();
-    s()[1] = mesh.nPoints();
-    return s;
+    labelList sizes(2);
+    sizes[0] = mesh.nCells();
+    sizes[1] = mesh.nPoints();
+    return sizes;
 }
 
 
@@ -51,9 +48,9 @@ Foam::AveragingMethods::Dual<Type>::Dual
     const fvMesh& mesh
 )
 :
-    AveragingMethod<Type>(io, dict, mesh, size(mesh)),
+    AveragingMethod<Type>(io, dict, mesh, sizing(mesh)),
     volumeCell_(mesh.V()),
-    volumeDual_(mesh.nPoints(), 0.0),
+    volumeDual_(mesh.nPoints(), Zero),
     dataCell_(FieldField<Field, Type>::operator[](0)),
     dataDual_(FieldField<Field, Type>::operator[](1))
 {
@@ -95,13 +92,6 @@ Foam::AveragingMethods::Dual<Type>::Dual
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::AveragingMethods::Dual<Type>::~Dual()
-{}
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
@@ -132,7 +122,7 @@ void Foam::AveragingMethods::Dual<Type>::add
         coordinates[0]*value
       / (0.25*volumeCell_[tetIs.cell()]);
 
-    for(label i = 0; i < 3; i ++)
+    for (label i = 0; i < 3; ++i)
     {
         dataDual_[triIs[i]] +=
             coordinates[i+1]*value
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
index 1850b0d9ba..b8837f8534 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
@@ -94,14 +94,12 @@ private:
         Field<Type>& dataDual_;
 
 
-    //- Private static member functions
+    //- Private Member Functions
 
-        //- Return the size of the FieldField parts
-        static autoPtr<labelList> size(const fvMesh &mesh);
+        //- The sizing for the FieldField parts
+        static labelList sizing(const fvMesh& mesh);
 
 
-    //- Private member functions
-
         //- Sync point data over processor boundaries
         void syncDualData();
 
@@ -119,7 +117,7 @@ public:
         (
             const IOobject& io,
             const dictionary& dict,
-            const fvMesh &mesh
+            const fvMesh& mesh
         );
 
         //- Construct a copy
@@ -136,7 +134,7 @@ public:
 
 
     //- Destructor
-    virtual ~Dual();
+    virtual ~Dual() = default;
 
 
     //- Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
index 04fb468871..10e31dfd42 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
@@ -37,7 +37,6 @@ inline Foam::label Foam::pairPotentialList::pairPotentialIndex
     {
         index = a*(2*nIds_ - a - 1)/2 + b;
     }
-
     else
     {
         index = b*(2*nIds_ - b - 1)/2 + a;
@@ -72,7 +71,7 @@ inline Foam::scalar Foam::pairPotentialList::rCutMaxSqr() const
 
 inline const Foam::pairPotential& Foam::pairPotentialList::electrostatic() const
 {
-    return electrostaticPotential_;
+    return *electrostaticPotential_;
 }
 
 
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index 8ff701eea8..077e50bf9d 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
@@ -29,7 +29,7 @@ template<class CloudType>
 inline const Foam::SprayCloud<CloudType>&
 Foam::SprayCloud<CloudType>::cloudCopy() const
 {
-    return cloudCopyPtr_();
+    return *cloudCopyPtr_;
 }
 
 
@@ -45,7 +45,7 @@ template<class CloudType>
 inline Foam::AtomizationModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::atomization()
 {
-    return atomizationModel_();
+    return *atomizationModel_;
 }
 
 
@@ -61,7 +61,7 @@ template<class CloudType>
 inline Foam::BreakupModel<Foam::SprayCloud<CloudType>>&
 Foam::SprayCloud<CloudType>::breakup()
 {
-    return breakupModel_();
+    return *breakupModel_;
 }
 
 
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index 21cd34dc33..a1df8e61b4 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -787,7 +787,7 @@ Foam::lumpedPointMovement::interpolator() const
         );
     }
 
-    return interpolatorPtr_();
+    return *interpolatorPtr_;
 }
 
 
diff --git a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
index 04ea707fa8..1d48424208 100644
--- a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
+++ b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
@@ -67,7 +67,7 @@ Foam::blockEdge::blockEdge
 Foam::autoPtr<Foam::blockEdge> Foam::blockEdge::clone() const
 {
     NotImplemented;
-    return autoPtr<blockEdge>(nullptr);
+    return autoPtr<blockEdge>();
 }
 
 
diff --git a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
index dd194b52c4..812fb52fb3 100644
--- a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
+++ b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
@@ -65,7 +65,7 @@ Foam::blockFace::blockFace
 Foam::autoPtr<Foam::blockFace> Foam::blockFace::clone() const
 {
     NotImplemented;
-    return autoPtr<blockFace>(nullptr);
+    return autoPtr<blockFace>();
 }
 
 
diff --git a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
index e40ff63751..9dcf58c9b0 100644
--- a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
+++ b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
@@ -45,7 +45,7 @@ Foam::blockVertex::blockVertex()
 Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::clone() const
 {
     NotImplemented;
-    return autoPtr<blockVertex>(nullptr);
+    return autoPtr<blockVertex>();
 }
 
 
@@ -99,7 +99,7 @@ Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::New
             << firstToken.info()
             << exit(FatalIOError);
 
-        return autoPtr<blockVertex>(nullptr);
+        return autoPtr<blockVertex>();
     }
 }
 
diff --git a/src/mesh/blockMesh/blocks/block/block.H b/src/mesh/blockMesh/blocks/block/block.H
index fb3012016d..b0941d3462 100644
--- a/src/mesh/blockMesh/blocks/block/block.H
+++ b/src/mesh/blockMesh/blocks/block/block.H
@@ -134,7 +134,7 @@ public:
         autoPtr<block> clone() const
         {
             NotImplemented;
-            return autoPtr<block>(nullptr);
+            return autoPtr<block>();
         }
 
         //- New function which constructs and returns pointer to a block
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 267ba41c12..7e40b1e95f 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -79,7 +79,7 @@ Foam::displacementMeshMoverMotionSolver::meshMover() const
             pointDisplacement_
         );
     }
-    return meshMoverPtr_();
+    return *meshMoverPtr_;
 }
 
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index f68aa1d09a..d018e5703e 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -1291,7 +1291,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
 {
     Info<< typeName << " : Smoothing using Medial Axis ..." << endl;
 
-    const indirectPrimitivePatch& pp = adaptPatchPtr_;
+    const indirectPrimitivePatch& pp = *adaptPatchPtr_;
     const labelList& meshPoints = pp.meshPoints();
 
 
@@ -1336,7 +1336,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     );
 
     //- Use strict extrusionIsland detection
-    const Switch detectExtrusionIsland = coeffDict.lookupOrDefault<Switch>
+    const bool detectExtrusionIsland = coeffDict.lookupOrDefault
     (
         "detectExtrusionIsland",
         false
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 5c9528786f..84c895a95a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -672,15 +672,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
     );
 
     // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields
     mesh_.updateMesh(map);
 
     // Move mesh (since morphing might not do this)
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        mesh_.movePoints(map().preMotionPoints());
+        mesh_.movePoints(map.preMotionPoints());
     }
     else
     {
@@ -698,7 +699,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
     // Update intersections. Recalculate intersections for exposed faces.
     labelList newExposedFaces = renumber
     (
-        map().reverseFaceMap(),
+        map.reverseFaceMap(),
         exposedFaces
     );
 
@@ -707,7 +708,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
 
     updateMesh(map, newExposedFaces);
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -863,15 +864,16 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         doSplitFaces(splitFaces, splits, meshMod);
 
         // Change the mesh (no inflation)
-        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+        autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh (since morphing might not do this)
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
 
         // Reset the instance for if in overwrite mode
@@ -884,7 +886,7 @@ Foam::label Foam::meshRefinement::splitFacesUndo
 
         forAll(originalFaces, i)
         {
-            inplaceRenumber(map().reversePointMap(), originalFaces[i]);
+            inplaceRenumber(map.reversePointMap(), originalFaces[i]);
         }
 
         {
@@ -894,9 +896,9 @@ Foam::label Foam::meshRefinement::splitFacesUndo
                 splitFaceToIndex.insert(splitFaces[i], i);
             }
 
-            forAll(map().faceMap(), facei)
+            forAll(map.faceMap(), facei)
             {
-                label oldFacei = map().faceMap()[facei];
+                label oldFacei = map.faceMap()[facei];
                 Map<label>::iterator oldFaceFnd = splitFaceToIndex.find
                 (
                     oldFacei
@@ -930,13 +932,13 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         {
             meshRefinement::updateList
             (
-                map().faceMap(),
+                map.faceMap(),
                 label(-1),
                 duplicateFace
             );
         }
 
-        const labelList& oldToNewFaces = map().reverseFaceMap();
+        const labelList& oldToNewFaces = map.reverseFaceMap();
         forAll(baffles, i)
         {
             labelPair& baffle = baffles[i];
@@ -1090,15 +1092,16 @@ Foam::label Foam::meshRefinement::splitFacesUndo
 
 
         // Change the mesh (no inflation)
-        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+        autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh (since morphing might not do this)
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
 
         // Reset the instance for if in overwrite mode
@@ -1110,8 +1113,8 @@ Foam::label Foam::meshRefinement::splitFacesUndo
         // ~~~~~~~~~~~~~~~~~~~~~~
 
         {
-            const labelList& oldToNewFaces = map().reverseFaceMap();
-            const labelList& oldToNewPoints = map().reversePointMap();
+            const labelList& oldToNewFaces = map.reverseFaceMap();
+            const labelList& oldToNewPoints = map.reversePointMap();
 
             // Compact out merged faces
             DynamicList<label> changedFaces(mergedIndices.size());
@@ -1171,13 +1174,13 @@ Foam::label Foam::meshRefinement::splitFacesUndo
             {
                 meshRefinement::updateList
                 (
-                    map().faceMap(),
+                    map.faceMap(),
                     label(-1),
                     duplicateFace
                 );
             }
 
-            const labelList& reverseFaceMap = map().reverseFaceMap();
+            const labelList& reverseFaceMap = map.reverseFaceMap();
             forAll(baffles, i)
             {
                 labelPair& baffle = baffles[i];
@@ -1478,14 +1481,13 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
         map = distributor.distribute(distribution);
 
         // Update numbering of meshRefiner
-        distribute(map);
+        distribute(map());
 
         // Set correct instance (for if overwrite)
         mesh_.setInstance(timeName());
         setInstance(mesh_.facesInstance());
 
 
-
         if (debug && keepZoneFaces)
         {
             const faceZoneMesh& fZones = mesh_.faceZones();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 0d7a72c24f..b0e31ebe7d 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -584,19 +584,20 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
     }
 
 
-    autoPtr<mapPolyMesh> map;
+    autoPtr<mapPolyMesh> mapPtr;
     if (returnReduce(nBaffles, sumOp<label>()))
     {
         // Change the mesh (no inflation, parallel sync)
-        map = meshMod.changeMesh(mesh_, false, true);
+        mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh if in inflation mode
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -612,8 +613,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
         //  this changes also the cell centre positions.
         faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
 
-        const labelList& reverseFaceMap = map().reverseFaceMap();
-        const labelList& faceMap = map().faceMap();
+        const labelList& reverseFaceMap = map.reverseFaceMap();
+        const labelList& faceMap = map.faceMap();
 
         // Pick up owner side of baffle
         forAll(ownPatch, oldFaceI)
@@ -650,7 +651,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
         updateMesh(map, baffledFacesSet.toc());
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -1154,7 +1155,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
     const Map<label>& faceToPatch
 )
 {
-    autoPtr<mapPolyMesh> map;
+    autoPtr<mapPolyMesh> mapPtr;
 
     if (returnReduce(couples.size()+faceToPatch.size(), sumOp<label>()))
     {
@@ -1280,15 +1281,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
 
 
         // Change the mesh (no inflation)
-        map = meshMod.changeMesh(mesh_, false, true);
+        mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh (since morphing does not do this)
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -1307,13 +1309,13 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
 
         forAll(couples, i)
         {
-            label newFace0 = map().reverseFaceMap()[couples[i].first()];
+            const label newFace0 = map.reverseFaceMap()[couples[i].first()];
             if (newFace0 != -1)
             {
                 newExposedFaces[newI++] = newFace0;
             }
 
-            label newFace1 = map().reverseFaceMap()[couples[i].second()];
+            const label newFace1 = map.reverseFaceMap()[couples[i].second()];
             if (newFace1 != -1)
             {
                 newExposedFaces[newI++] = newFace1;
@@ -1323,7 +1325,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
         updateMesh(map, newExposedFaces);
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -4114,7 +4116,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
         << ')' << endl;
 
 
-    autoPtr<mapPolyMesh> map;
+    autoPtr<mapPolyMesh> mapPtr;
 
     if (nNonManifPoints)
     {
@@ -4125,15 +4127,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
         pointDuplicator.setRefinement(regionSide, meshMod);
 
         // Change the mesh (no inflation, parallel sync)
-        map = meshMod.changeMesh(mesh_, false, true);
+        mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh if in inflation mode
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -4146,10 +4149,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
 
         // Update intersections. Is mapping only (no faces created, positions
         // stay same) so no need to recalculate intersections.
-        updateMesh(map, labelList(0));
+        updateMesh(map, labelList());
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -4177,7 +4180,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergePoints
         }
     }
 
-    autoPtr<mapPolyMesh> map;
+    autoPtr<mapPolyMesh> mapPtr;
 
     if (returnReduce(nPointPairs, sumOp<label>()))
     {
@@ -4199,15 +4202,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergePoints
         polyMeshAdder::mergePoints(mesh_, pointToMaster, meshMod);
 
         // Change the mesh (no inflation, parallel sync)
-        map = meshMod.changeMesh(mesh_, false, true);
+        mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh if in inflation mode
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -4220,10 +4224,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergePoints
 
         // Update intersections. Is mapping only (no faces created, positions
         // stay same) so no need to recalculate intersections.
-        updateMesh(map, labelList(0));
+        updateMesh(map, labelList());
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -4764,7 +4768,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
     // Update fields
-    mesh_.updateMesh(map);
+    mesh_.updateMesh(map());
 
     // Move mesh if in inflation mode
     if (map().hasMotionPoints())
@@ -4807,7 +4811,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     }
 
     // None of the faces has changed, only the zones. Still...
-    updateMesh(map, labelList());
+    updateMesh(map(), labelList());
 
     return map;
 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 3027ac71f1..aecae52674 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -106,15 +106,16 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         faceCombiner.setRefinement(mergeSets, meshMod);
 
         // Change the mesh (no inflation)
-        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+        autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+        mapPolyMesh& map = *mapPtr;
 
         // Update fields
         mesh_.updateMesh(map);
 
         // Move mesh (since morphing does not do this)
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh_.movePoints(map().preMotionPoints());
+            mesh_.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -135,7 +136,7 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         forAll(mergeSets, setI)
         {
             label oldMasterI = mergeSets[setI][0];
-            retestFaces.insert(map().reverseFaceMap()[oldMasterI]);
+            retestFaces.insert(map.reverseFaceMap()[oldMasterI]);
         }
         updateMesh(map, growFaceCellFace(retestFaces));
     }
@@ -143,8 +144,7 @@ Foam::label Foam::meshRefinement::mergePatchFaces
     return nFaceSets;
 }
 
-//
-//
+
 //// Remove points not used by any face or points used by only two faces where
 //// the edges are in line
 //Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
@@ -369,7 +369,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
         // Update fields
-        mesh_.updateMesh(map);
+        mesh_.updateMesh(map());
 
         // Move mesh (since morphing does not do this)
         if (map().hasMotionPoints())
@@ -385,7 +385,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
         // Reset the instance for if in overwrite mode
         mesh_.setInstance(timeName());
 
-        faceCombiner.updateMesh(map);
+        faceCombiner.updateMesh(map());
 
         // Get the kept faces that need to be recalculated.
         // Merging two boundary faces might shift the cell centre
@@ -397,7 +397,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             label oldMasterI = allFaceSets[setI][0];
             retestFaces.insert(map().reverseFaceMap()[oldMasterI]);
         }
-        updateMesh(map, growFaceCellFace(retestFaces));
+        updateMesh(map(), growFaceCellFace(retestFaces));
 
         if (debug&meshRefinement::MESH)
         {
@@ -558,7 +558,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
             // Update fields
-            mesh_.updateMesh(map);
+            mesh_.updateMesh(map());
 
             // Move mesh (since morphing does not do this)
             if (map().hasMotionPoints())
@@ -575,7 +575,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             // Reset the instance for if in overwrite mode
             mesh_.setInstance(timeName());
 
-            faceCombiner.updateMesh(map);
+            faceCombiner.updateMesh(map());
 
             // Renumber restore maps
             inplaceMapKey(map().reversePointMap(), restoredPoints);
@@ -596,7 +596,7 @@ Foam::label Foam::meshRefinement::mergePatchFacesUndo
             // Experimental:restore all points/face/cells in maps
             updateMesh
             (
-                map,
+                map(),
                 growFaceCellFace(retestFaces),
                 restoredPoints,
                 restoredFaces,
@@ -640,15 +640,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemovePoints
     pointRemover.setRefinement(pointCanBeDeleted, meshMod);
 
     // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields
     mesh_.updateMesh(map);
 
     // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        mesh_.movePoints(map().preMotionPoints());
+        mesh_.movePoints(map.preMotionPoints());
     }
     else
     {
@@ -681,7 +682,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemovePoints
         checkData();
     }
 
-    return map;
+    return mapPtr;
 }
 
 
@@ -713,15 +714,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRestorePoints
     );
 
     // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false, true);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields
     mesh_.updateMesh(map);
 
     // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        mesh_.movePoints(map().preMotionPoints());
+        mesh_.movePoints(map.preMotionPoints());
     }
     else
     {
@@ -737,7 +739,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRestorePoints
     labelHashSet retestFaces(2*facesToRestore.size());
     forAll(facesToRestore, i)
     {
-        label faceI = map().reverseFaceMap()[facesToRestore[i]];
+        label faceI = map.reverseFaceMap()[facesToRestore[i]];
         if (faceI >= 0)
         {
             retestFaces.insert(faceI);
@@ -753,7 +755,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRestorePoints
         checkData();
     }
 
-    return map;
+    return mapPtr;
 }
 
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index e7f9994f86..f66627f01e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -2340,15 +2340,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
     meshCutter_.setRefinement(cellsToRefine, meshMod);
 
     // Create mesh (no inflation), return map from old to new mesh.
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false);
+    autoPtr<mapPolyMesh> mapPtr = meshMod.changeMesh(mesh_, false);
+    mapPolyMesh& map = *mapPtr;
 
     // Update fields
     mesh_.updateMesh(map);
 
     // Optionally inflate mesh
-    if (map().hasMotionPoints())
+    if (map.hasMotionPoints())
     {
-        mesh_.movePoints(map().preMotionPoints());
+        mesh_.movePoints(map.preMotionPoints());
     }
     else
     {
@@ -2362,7 +2363,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
     // Update intersection info
     updateMesh(map, getChangedFaces(map, cellsToRefine));
 
-    return map;
+    return mapPtr;
 }
 
 
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index aa05d3b8cb..8665ee4d38 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -423,7 +423,8 @@ Foam::refinementFeatures::regionEdgeTrees() const
             );
         }
     }
-    return regionEdgeTreesPtr_();
+
+    return *regionEdgeTreesPtr_;
 }
 
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 7b4db14fec..41597249d9 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3361,7 +3361,7 @@ void Foam::snappyLayerDriver::addLayers
             (
                 numLayers,              // per patch the num layers
                 patchIDs,               // patches that are being moved
-                pp,                     // indirectpatch for all faces moving
+                *pp,                    // indirectpatch for all faces moving
 
                 patchDisp,
                 patchNLayers,
@@ -3373,7 +3373,7 @@ void Foam::snappyLayerDriver::addLayers
             // of the patchDisp here.
             syncPatchDisplacement
             (
-                pp,
+                *pp,
                 scalarField(patchDisp.size(), 0.0), //minThickness,
                 patchDisp,
                 patchNLayers,
@@ -3555,7 +3555,7 @@ void Foam::snappyLayerDriver::addLayers
         (
             mesh,
             globalFaces,
-            pp
+            *pp
         )
     );
 
@@ -3570,7 +3570,7 @@ void Foam::snappyLayerDriver::addLayers
     (
         globalFaces,
         edgeGlobalFaces,
-        pp,
+        *pp,
 
         edgePatchID,
         edgeZoneID,
@@ -3605,7 +3605,7 @@ void Foam::snappyLayerDriver::addLayers
         (
             numLayers,                  // per patch the num layers
             patchIDs,                   // patches that are being moved
-            pp,                         // indirectpatch for all faces moving
+            *pp,                        // indirectpatch for all faces moving
 
             patchDisp,
             patchNLayers,
@@ -3622,7 +3622,7 @@ void Foam::snappyLayerDriver::addLayers
 
         handleNonStringConnected
         (
-            pp,
+            *pp,
             patchDisp,
             patchNLayers,
             extrudeStatus
@@ -3634,7 +3634,7 @@ void Foam::snappyLayerDriver::addLayers
 
         handleNonManifolds
         (
-            pp,
+            *pp,
             meshEdges,
             edgeGlobalFaces,
 
@@ -3648,7 +3648,7 @@ void Foam::snappyLayerDriver::addLayers
 
         handleFeatureAngle
         (
-            pp,
+            *pp,
             meshEdges,
             layerParams.featureAngle(),
 
@@ -3670,7 +3670,7 @@ void Foam::snappyLayerDriver::addLayers
 
             handleWarpedFaces
             (
-                pp,
+                *pp,
                 layerParams.maxFaceThicknessRatio(),
                 edge0Len,
                 cellLevel,
@@ -3686,7 +3686,7 @@ void Foam::snappyLayerDriver::addLayers
         //
         //handleMultiplePatchFaces
         //(
-        //    pp,
+        //    *pp,
         //
         //    patchDisp,
         //    patchNLayers,
@@ -3700,7 +3700,7 @@ void Foam::snappyLayerDriver::addLayers
         {
             growNoExtrusion
             (
-                pp,
+                *pp,
                 patchDisp,
                 patchNLayers,
                 extrudeStatus
@@ -3730,7 +3730,7 @@ void Foam::snappyLayerDriver::addLayers
     scalarField expansionRatio(pp().nPoints());
     calculateLayerThickness
     (
-        pp,
+        *pp,
         patchIDs,
         layerParams,
         cellLevel,
@@ -3754,8 +3754,8 @@ void Foam::snappyLayerDriver::addLayers
     // Per face wanted overall layer thickness
     scalarField faceWantedThickness(mesh.nFaces(), 0.0);
     {
-        UIndirectList<scalar>(faceWantedThickness, pp().addressing()) =
-            avgPointData(pp, thickness);
+        UIndirectList<scalar>(faceWantedThickness, pp->addressing()) =
+            avgPointData(*pp, thickness);
     }
 
 
@@ -3838,7 +3838,7 @@ void Foam::snappyLayerDriver::addLayers
             // that.
             syncPatchDisplacement
             (
-                pp,
+                *pp,
                 minThickness,
                 patchDisp,
                 patchNLayers,
@@ -3848,7 +3848,7 @@ void Foam::snappyLayerDriver::addLayers
             // Displacement acc. to pointnormals
             getPatchDisplacement
             (
-                pp,
+                *pp,
                 thickness,
                 minThickness,
                 patchDisp,
@@ -3872,7 +3872,7 @@ void Foam::snappyLayerDriver::addLayers
                 motionSmootherAlgo::setDisplacement
                 (
                     patchIDs,
-                    pp,
+                    *pp,
                     patchDisp,
                     displacement
                 );
@@ -3912,7 +3912,7 @@ void Foam::snappyLayerDriver::addLayers
             (
                 globalFaces,
                 edgeGlobalFaces,
-                pp,
+                *pp,
                 minThickness,
                 dummySet,
                 patchDisp,
@@ -3966,7 +3966,7 @@ void Foam::snappyLayerDriver::addLayers
             labelList nPatchFaceLayers(pp().size(), -1);
             setupLayerInfoTruncation
             (
-                pp,
+                *pp,
                 patchNLayers,
                 extrudeStatus,
                 layerParams.nBufferCellsNoExtrude(),
@@ -4027,7 +4027,7 @@ void Foam::snappyLayerDriver::addLayers
             // undo if neccesary.
 
             autoPtr<fvMesh> newMeshPtr;
-            autoPtr<mapPolyMesh> map = meshMod.makeMesh
+            autoPtr<mapPolyMesh> mapPtr = meshMod.makeMesh
             (
                 newMeshPtr,
                 IOobject
@@ -4042,7 +4042,8 @@ void Foam::snappyLayerDriver::addLayers
                 mesh,           // original mesh
                 true            // parallel sync
             );
-            fvMesh& newMesh = newMeshPtr();
+            fvMesh& newMesh = *newMeshPtr;
+            mapPolyMesh& map = *mapPtr;
 
             // Get timing, but more importantly get memory information
             addProfiling(grow, "snappyHexMesh::layers::updateMesh");
@@ -4067,7 +4068,7 @@ void Foam::snappyLayerDriver::addLayers
             (
                 newMesh,
                 addLayer,
-                avgPointData(pp, mag(patchDisp))(), // current thickness
+                avgPointData(*pp, mag(patchDisp))(), // current thickness
 
                 cellNLayers,
                 faceRealThickness
@@ -4113,7 +4114,7 @@ void Foam::snappyLayerDriver::addLayers
                     facei++
                 )
                 {
-                    label newMeshFacei = map().faceMap()[facei];
+                    label newMeshFacei = map.faceMap()[facei];
                     if (newMeshFacei != -1)
                     {
                         meshToNewMesh[newMeshFacei] = facei;
@@ -4164,7 +4165,7 @@ void Foam::snappyLayerDriver::addLayers
                 extrudeStatus
             );
 
-            label nTotExtruded = countExtrusion(pp, extrudeStatus);
+            label nTotExtruded = countExtrusion(*pp, extrudeStatus);
             label nTotFaces = returnReduce(pp().size(), sumOp<label>());
             label nTotAddedCells = returnReduce(nAddedCells, sumOp<label>());
 
@@ -4193,7 +4194,7 @@ void Foam::snappyLayerDriver::addLayers
             {
                 growNoExtrusion
                 (
-                    pp,
+                    *pp,
                     patchDisp,
                     patchNLayers,
                     extrudeStatus
@@ -4211,7 +4212,8 @@ void Foam::snappyLayerDriver::addLayers
 
     {
         // Apply the stored topo changes to the current mesh.
-        autoPtr<mapPolyMesh> map = savedMeshMod.changeMesh(mesh, false);
+        autoPtr<mapPolyMesh> mapPtr = savedMeshMod.changeMesh(mesh, false);
+        mapPolyMesh& map = *mapPtr;
 
         // Hack to remove meshPhi - mapped incorrectly. TBD.
         mesh.clearOut();
@@ -4220,9 +4222,9 @@ void Foam::snappyLayerDriver::addLayers
         mesh.updateMesh(map);
 
         // Move mesh (since morphing does not do this)
-        if (map().hasMotionPoints())
+        if (map.hasMotionPoints())
         {
-            mesh.movePoints(map().preMotionPoints());
+            mesh.movePoints(map.preMotionPoints());
         }
         else
         {
@@ -4238,7 +4240,7 @@ void Foam::snappyLayerDriver::addLayers
         // Update numbering of faceWantedThickness
         meshRefinement::updateList
         (
-            map().faceMap(),
+            map.faceMap(),
             scalar(0),
             faceWantedThickness
         );
@@ -4283,7 +4285,7 @@ void Foam::snappyLayerDriver::addLayers
             DynamicList<label> candidates(baffles.size()*4);
 
             // Mark whether old face was on baffle
-            PackedBoolList oldBaffleFace(map().nOldFaces());
+            PackedBoolList oldBaffleFace(map.nOldFaces());
             forAll(baffles, i)
             {
                 const labelPair& baffle = baffles[i];
@@ -4301,14 +4303,14 @@ void Foam::snappyLayerDriver::addLayers
                 facei++
             )
             {
-                label oldFacei = map().faceMap()[facei];
+                label oldFacei = map.faceMap()[facei];
                 if (oldFacei != -1 && oldBaffleFace[oldFacei])
                 {
                     const face& f = mesh.faces()[facei];
                     forAll(f, fp)
                     {
                         label pointi = f[fp];
-                        label oldPointi = map().pointMap()[pointi];
+                        label oldPointi = map.pointMap()[pointi];
 
                         if (pointToMaster[oldPointi] != -1)
                         {
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
index 007085e244..72556d3737 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
@@ -116,7 +116,7 @@ template<class SourcePatch, class TargetPatch>
 inline const Foam::mapDistribute&
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::srcMap() const
 {
-    return srcMapPtr_();
+    return *srcMapPtr_;
 }
 
 
@@ -188,7 +188,7 @@ template<class SourcePatch, class TargetPatch>
 inline const Foam::mapDistribute&
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::tgtMap() const
 {
-    return tgtMapPtr_();
+    return *tgtMapPtr_;
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
index 08d9b114c1..b430bf819c 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
@@ -132,7 +132,7 @@ public:
 
             virtual const AMIPatchToPatchInterpolation& AMI() const
             {
-                return amiPtr_();
+                return *amiPtr_;
             }
 
             //- Return face transformation tensor
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index 6cc7600cac..1e2d3241e2 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -132,7 +132,7 @@ public:
 
             virtual const AMIPatchToPatchInterpolation& AMI() const
             {
-                return amiPtr_();
+                return *amiPtr_;
             }
 
             //- Return face transformation tensor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 2c108b2451..935a541180 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -82,7 +82,7 @@ class cyclicACMIPointPatchField
                 );
             }
 
-            return ppiPtr_();
+            return *ppiPtr_;
         }
 
         //- Neighbour side patch interpolation
@@ -99,7 +99,7 @@ class cyclicACMIPointPatchField
                 );
             }
 
-            return nbrPpiPtr_();
+            return *nbrPpiPtr_;
         }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index 64765e52f7..e508719bdd 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -82,7 +82,7 @@ class cyclicAMIPointPatchField
                 );
             }
 
-            return ppiPtr_();
+            return *ppiPtr_;
         }
 
         //- Neighbour side patch interpolation
@@ -99,7 +99,7 @@ class cyclicAMIPointPatchField
                 );
             }
 
-            return nbrPpiPtr_();
+            return *nbrPpiPtr_;
         }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 12f9546fca..76a80cfefc 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -810,7 +810,7 @@ const Foam::AMIPatchToPatchInterpolation& Foam::cyclicAMIPolyPatch::AMI() const
         resetAMI(AMIMethod_);
     }
 
-    return AMIPtr_();
+    return *AMIPtr_;
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 481f15f71b..de8b54f402 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -94,7 +94,7 @@ void Foam::cylindrical::init
 
 Foam::cylindrical::cylindrical(const cylindrical& r)
 :
-    Rptr_(r.Rptr_, false),  // clone
+    Rptr_(r.Rptr_.clone()),
     origin_(r.origin_),
     e3_(r.e3_)
 {}
@@ -177,15 +177,11 @@ Foam::cylindrical::cylindrical
 }
 
 
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::cylindrical::clear()
 {
-    if (!Rptr_.empty())
-    {
-        Rptr_.clear();
-    }
+    Rptr_.clear();
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index b8502d8aab..bf2c57879b 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -181,7 +181,7 @@ public:
 
         virtual const tensorField& Tr() const
         {
-            return Rptr_();
+            return *Rptr_;
         }
 
         //- Transform vectorField using transformation tensor field
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index b4a9e78820..cb638dd453 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.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.
@@ -48,6 +48,24 @@ Foam::coordinateSystem::coordinateSystem()
 {}
 
 
+Foam::coordinateSystem::coordinateSystem(const coordinateSystem& cs)
+:
+    name_(cs.name_),
+    note_(cs.note_),
+    origin_(cs.origin_),
+    R_(cs.R_.clone())
+{}
+
+
+Foam::coordinateSystem::coordinateSystem(coordinateSystem&& cs)
+:
+    name_(std::move(cs.name_)),
+    note_(std::move(cs.note_)),
+    origin_(std::move(cs.origin_)),
+    R_(std::move(cs.R_))
+{}
+
+
 Foam::coordinateSystem::coordinateSystem
 (
     const word& name,
@@ -55,9 +73,9 @@ Foam::coordinateSystem::coordinateSystem
 )
 :
     name_(name),
-    note_(),
+    note_(cs.note_),
     origin_(cs.origin_),
-    R_(cs.R().clone())
+    R_(cs.R_.clone())
 {}
 
 
@@ -176,12 +194,6 @@ Foam::coordinateSystem::coordinateSystem(Istream& is)
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::coordinateSystem::~coordinateSystem()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::dictionary Foam::coordinateSystem::dict(bool ignoreType) const
@@ -220,10 +232,8 @@ Foam::vector Foam::coordinateSystem::localToGlobal
     {
         return (R_->transform(local)) + origin_;
     }
-    else
-    {
-        return R_->transform(local);
-    }
+
+    return R_->transform(local);
 }
 
 
@@ -237,10 +247,8 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::localToGlobal
     {
         return (R_->transform(local)) + origin_;
     }
-    else
-    {
-        return R_->transform(local);
-    }
+
+    return R_->transform(local);
 }
 
 
@@ -254,10 +262,8 @@ Foam::vector Foam::coordinateSystem::globalToLocal
     {
         return R_->invTransform(global - origin_);
     }
-    else
-    {
-        return R_->invTransform(global);
-    }
+
+    return R_->invTransform(global);
 }
 
 
@@ -271,10 +277,8 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::globalToLocal
     {
         return R_->invTransform(global - origin_);
     }
-    else
-    {
-        return R_->invTransform(global);
-    }
+
+    return R_->invTransform(global);
 }
 
 
@@ -286,6 +290,17 @@ void Foam::coordinateSystem::clear()
 }
 
 
+void Foam::coordinateSystem::transfer(coordinateSystem& cs)
+{
+    name_ = std::move(cs.name_);
+    note_ = std::move(cs.note_);
+    origin_ = std::move(cs.origin_);
+    R_ = std::move(cs.R_);
+
+    cs.clear();
+}
+
+
 void Foam::coordinateSystem::write(Ostream& os) const
 {
     os  << type() << " origin: " << origin() << nl;
@@ -304,7 +319,7 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
 
     if (note_.size())
     {
-        // note is optional
+        // The 'note' is optional
         os.writeEntry("note", note_);
     }
 
@@ -320,12 +335,26 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+void Foam::coordinateSystem::operator=(const coordinateSystem& cs)
+{
+    name_ = cs.name_;
+    note_ = cs.note_;
+    origin_ = cs.origin_;
+    R_ = cs.R_.clone();
+}
+
+void Foam::coordinateSystem::operator=(coordinateSystem&& cs)
+{
+    transfer(cs);
+}
+
+
 void Foam::coordinateSystem::init(const dictionary& rhs)
 {
     rhs.lookup("origin") >> origin_;
     note_.clear();
     rhs.readIfPresent("note", note_);
-    R_.reset(coordinateRotation::New(rhs.subDict("coordinateRotation")).ptr());
+    R_ = coordinateRotation::New(rhs.subDict("coordinateRotation"));
 }
 
 
@@ -347,14 +376,11 @@ void Foam::coordinateSystem::init
 
     rhs.lookup("origin") >> origin_;
 
-    // The note entry is optional
+    // The 'note' entry is optional
     note_.clear();
     rhs.readIfPresent("note", note_);
 
-    R_.reset
-    (
-        coordinateRotation::New(rhs.subDict("coordinateRotation"), obr).ptr()
-    );
+    R_ = coordinateRotation::New(rhs.subDict("coordinateRotation"), obr);
 }
 
 
@@ -365,8 +391,8 @@ bool Foam::operator!=(const coordinateSystem& a, const coordinateSystem& b)
     return
     (
         a.origin() != b.origin()
-     || a.R().R() != b.R().R()
      || a.type() != b.type()
+     || a.R().R() != b.R().R()
     );
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index ee81ee365a..4d148b0814 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.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.
@@ -151,11 +151,17 @@ public:
         //- Construct null. This is equivalent to an identity coordinateSystem
         coordinateSystem();
 
-        //- Construct copy with a different name
+        //- Copy construct
+        coordinateSystem(const coordinateSystem& cs);
+
+        //- Move construct
+        coordinateSystem(coordinateSystem&& cs);
+
+        //- Copy construct with a different name
         coordinateSystem
         (
             const word& name,
-            const coordinateSystem&
+            const coordinateSystem& cs
         );
 
         //- Construct from origin and rotation
@@ -231,7 +237,7 @@ public:
 
 
     //- Destructor
-    virtual ~coordinateSystem();
+    virtual ~coordinateSystem() = default;
 
 
     // Member Functions
@@ -265,13 +271,13 @@ public:
             //- Return const reference to co-ordinate rotation
             const coordinateRotation& R() const
             {
-                return R_();
+                return *R_;
             }
 
             //- Return non const reference to co-ordinate rotation
             coordinateRotation& R()
             {
-                return R_();
+                return *R_;
             }
 
             //- Update and return the co-ordinate rotation for a list of cells
@@ -282,7 +288,7 @@ public:
             )
             {
                 R_->updateCells(mesh, cells);
-                return R_();
+                return *R_;
             }
 
             //- Return as dictionary of entries
@@ -309,6 +315,9 @@ public:
             //  Also resets the note
             virtual void clear();
 
+            //- Transfer contents from parameter
+            void transfer(coordinateSystem& cs);
+
 
         // Write
 
@@ -380,12 +389,19 @@ public:
 
     // Member Operators
 
+        //- Copy assignment
+        void operator=(const coordinateSystem& cs);
+
+        //- Move assignment
+        void operator=(coordinateSystem&& cs);
+
+
         // friend Operators
 
             friend bool operator!=
             (
-                const coordinateSystem&,
-                const coordinateSystem&
+                const coordinateSystem& a,
+                const coordinateSystem& b
             );
 
 
diff --git a/src/meshTools/edgeMesh/edgeMesh.C b/src/meshTools/edgeMesh/edgeMesh.C
index f91f5a1a81..801e53bb6f 100644
--- a/src/meshTools/edgeMesh/edgeMesh.C
+++ b/src/meshTools/edgeMesh/edgeMesh.C
@@ -202,7 +202,7 @@ void Foam::edgeMesh::transfer(edgeMesh& mesh)
 {
     points_.transfer(mesh.points_);
     edges_.transfer(mesh.edges_);
-    pointEdgesPtr_ = mesh.pointEdgesPtr_;
+    pointEdgesPtr_ = std::move(mesh.pointEdgesPtr_);
 }
 
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index e27bdbabd4..114cf26f4c 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -965,7 +965,7 @@ Foam::extendedEdgeMesh::pointTree() const
         );
     }
 
-    return pointTree_();
+    return *pointTree_;
 }
 
 
@@ -1007,7 +1007,7 @@ Foam::extendedEdgeMesh::edgeTree() const
         );
     }
 
-    return edgeTree_();
+    return *edgeTree_;
 }
 
 
@@ -1095,8 +1095,8 @@ void Foam::extendedEdgeMesh::transfer(extendedEdgeMesh& mesh)
     featurePointNormals_.transfer(mesh.featurePointNormals_);
     featurePointEdges_.transfer(mesh.featurePointEdges_);
     regionEdges_.transfer(mesh.regionEdges_);
-    pointTree_ = mesh.pointTree_;
-    edgeTree_ = mesh.edgeTree_;
+    pointTree_ = std::move(mesh.pointTree_);
+    edgeTree_ = std::move(mesh.edgeTree_);
     edgeTreesByType_.transfer(mesh.edgeTreesByType_);
 }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index fc392dfaaf..9a42db9dfa 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -148,7 +148,7 @@ inline const Foam::mapDistribute& Foam::mappedPatchBase::map() const
         calcMapping();
     }
 
-    return mapPtr_();
+    return *mapPtr_;
 }
 
 
@@ -162,7 +162,7 @@ inline const Foam::AMIPatchToPatchInterpolation& Foam::mappedPatchBase::AMI
         calcAMI();
     }
 
-    return AMIPtr_();
+    return *AMIPtr_;
 }
 
 
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index c0e4cb2fa8..e49b2a7675 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -591,7 +591,7 @@ Foam::meshSearch::boundaryTree() const
         );
     }
 
-    return boundaryTreePtr_();
+    return *boundaryTreePtr_;
 }
 
 
@@ -637,7 +637,7 @@ Foam::meshSearch::cellTree() const
         );
     }
 
-    return cellTreePtr_();
+    return *cellTreePtr_;
 }
 
 
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
index 4b850c645a..343d5520de 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.H
@@ -130,7 +130,7 @@ public:
 
             //virtual const AMIPatchToPatchInterpolation& AMI() const
             //{
-            //    return amiPtr_();
+            //    return *amiPtr_;
             //}
 
             virtual const polyMesh& nbrMesh() const
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
index 9defb4090b..68260786e0 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -293,7 +293,7 @@ const Foam::AMIPatchToPatchInterpolation& Foam::regionCoupledBase::AMI() const
         resetAMI();
     }
 
-    return AMIPtr_();
+    return *AMIPtr_;
 }
 
 
diff --git a/src/meshTools/regionSplit/regionSplit.H b/src/meshTools/regionSplit/regionSplit.H
index 637a9593ec..e24fe96ed4 100644
--- a/src/meshTools/regionSplit/regionSplit.H
+++ b/src/meshTools/regionSplit/regionSplit.H
@@ -189,7 +189,7 @@ public:
         //- Return global region numbering
         const globalIndex& globalNumbering() const
         {
-            return globalNumberingPtr_();
+            return *globalNumberingPtr_;
         }
 
         //- Return local number of regions
diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
index 8dd26867a0..9f67882eb8 100644
--- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.H
@@ -139,7 +139,7 @@ public:
         virtual autoPtr<searchableSurface> clone() const
         {
             NotImplemented;
-            return autoPtr<searchableSurface>(nullptr);
+            return autoPtr<searchableSurface>();
         }
 
 
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 496b5c22dd..473fc1b964 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -613,7 +613,8 @@ Foam::triSurfaceMesh::edgeTree() const
 
         indexedOctree<treeDataEdge>::perturbTol() = oldTol;
     }
-    return edgeTree_();
+
+    return *edgeTree_;
 }
 
 
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 0957df277d..293474c1cc 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -243,7 +243,7 @@ public:
         autoPtr<topoSetSource> clone() const
         {
             NotImplemented;
-            return autoPtr<topoSetSource>(nullptr);
+            return autoPtr<topoSetSource>();
         }
 
 
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index adde26e085..2fde875cec 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -254,7 +254,7 @@ public:
         autoPtr<topoSet> clone() const
         {
             NotImplemented;
-            return autoPtr<topoSet>(nullptr);
+            return autoPtr<topoSet>();
         }
 
 
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index fe69905654..4ef1974fe5 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -250,7 +250,7 @@ Foam::triSurfaceSearch::tree() const
         indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
     }
 
-    return treePtr_();
+    return *treePtr_;
 }
 
 
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 526e813b6c..6c7f8574d2 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -253,7 +253,7 @@ const Foam::lduAddressing& Foam::dynamicOversetFvMesh::lduAddr() const
         // Build extended addressing
         updateAddressing();
     }
-    return lduPtr_();
+    return *lduPtr_;
 }
 
 
@@ -266,7 +266,7 @@ Foam::dynamicOversetFvMesh::primitiveLduAddr() const
             << "Extended addressing not allocated" << abort(FatalError);
     }
 
-    return lduPtr_();
+    return *lduPtr_;
 }
 
 
diff --git a/src/overset/oversetPolyPatch/oversetGAMGInterface.H b/src/overset/oversetPolyPatch/oversetGAMGInterface.H
index 3f9105b612..477368a2e6 100644
--- a/src/overset/oversetPolyPatch/oversetGAMGInterface.H
+++ b/src/overset/oversetPolyPatch/oversetGAMGInterface.H
@@ -152,7 +152,7 @@ public:
             //- Map for obtaining data in stencil order
             virtual const mapDistribute& cellInterpolationMap() const
             {
-                return mapPtr_();
+                return *mapPtr_;
             }
 
             //- Weights in stencil order
diff --git a/src/parallel/decompose/decompose/decompositionModel.H b/src/parallel/decompose/decompose/decompositionModel.H
index 2cbfa4d249..9503bcf078 100644
--- a/src/parallel/decompose/decompose/decompositionModel.H
+++ b/src/parallel/decompose/decompose/decompositionModel.H
@@ -123,7 +123,7 @@ public:
                         this->mesh().name()  // Name of mesh region
                     );
             }
-            return decomposerPtr_();
+            return *decomposerPtr_;
         }
 
         //- Helper: return IOobject with optionally absolute path provided
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 0206840ef7..247082f5ee 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1473,7 +1473,7 @@ const Foam::globalIndex& Foam::distributedTriSurfaceMesh::globalTris() const
     {
         globalTris_.reset(new globalIndex(triSurface::size()));
     }
-    return globalTris_;
+    return *globalTris_;
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
index 9f3ee2a289..daa2938e72 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
@@ -156,7 +156,7 @@ public:
         autoPtr<pyrolysisModel> clone() const
         {
             NotImplemented;
-            return autoPtr<pyrolysisModel>(nullptr);
+            return autoPtr<pyrolysisModel>();
         }
 
 
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index 471eb9e376..b841f0165f 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -70,7 +70,7 @@ inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
          << "Region mesh not available" << abort(FatalError);
     }
 
-    return regionMeshPtr_();
+    return *regionMeshPtr_;
 }
 
 
@@ -89,7 +89,7 @@ inline Foam::fvMesh& Foam::regionModels::regionModel::regionMesh()
          << "Region mesh not available" << abort(FatalError);
     }
 
-    return regionMeshPtr_();
+    return *regionMeshPtr_;
 }
 
 
@@ -116,7 +116,7 @@ Foam::regionModels::regionModel::outputProperties() const
             << abort(FatalError);
     }
 
-    return outputPropertiesPtr_();
+    return *outputPropertiesPtr_;
 }
 
 
@@ -130,7 +130,7 @@ Foam::regionModels::regionModel::outputProperties()
             << abort(FatalError);
     }
 
-    return outputPropertiesPtr_();
+    return *outputPropertiesPtr_;
 }
 
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
index fcc918fb64..25b55701b4 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
@@ -57,7 +57,7 @@ Foam::regionModels::regionModel1D::nMagSf() const
          << "Face normal areas not available" << abort(FatalError);
     }
 
-    return nMagSfPtr_();
+    return *nMagSfPtr_;
 }
 
 
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index 0c3571ef30..1d68751934 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -213,7 +213,7 @@ const Foam::volVectorField& Foam::regionModels::singleLayerRegion::nHat() const
             << abort(FatalError);
     }
 
-    return nHatPtr_();
+    return *nHatPtr_;
 }
 
 
@@ -226,7 +226,7 @@ const Foam::volScalarField& Foam::regionModels::singleLayerRegion::magSf() const
             << abort(FatalError);
     }
 
-    return magSfPtr_();
+    return *magSfPtr_;
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index c2f1c552a5..15512eb9e1 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -56,9 +56,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     filmRegionName_(ptf.filmRegionName_),
-    GammaMean_(ptf.GammaMean_, false),
-    a_(ptf.a_, false),
-    omega_(ptf.omega_, false)
+    GammaMean_(ptf.GammaMean_.clone()),
+    a_(ptf.a_.clone()),
+    omega_(ptf.omega_.clone())
 {}
 
 
@@ -89,9 +89,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
 :
     fixedValueFvPatchScalarField(wmfrhpsf),
     filmRegionName_(wmfrhpsf.filmRegionName_),
-    GammaMean_(wmfrhpsf.GammaMean_, false),
-    a_(wmfrhpsf.a_, false),
-    omega_(wmfrhpsf.omega_, false)
+    GammaMean_(wmfrhpsf.GammaMean_.clone()),
+    a_(wmfrhpsf.a_.clone()),
+    omega_(wmfrhpsf.omega_.clone())
 {}
 
 
@@ -104,9 +104,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
 :
     fixedValueFvPatchScalarField(wmfrhpsf, iF),
     filmRegionName_(wmfrhpsf.filmRegionName_),
-    GammaMean_(wmfrhpsf.GammaMean_, false),
-    a_(wmfrhpsf.a_, false),
-    omega_(wmfrhpsf.omega_, false)
+    GammaMean_(wmfrhpsf.GammaMean_.clone()),
+    a_(wmfrhpsf.a_.clone()),
+    omega_(wmfrhpsf.omega_.clone())
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 084e4ad6df..6bbf834e4e 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -56,9 +56,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
 :
     fixedValueFvPatchVectorField(ptf, p, iF, mapper),
     filmRegionName_(ptf.filmRegionName_),
-    GammaMean_(ptf.GammaMean_, false),
-    a_(ptf.a_, false),
-    omega_(ptf.omega_, false)
+    GammaMean_(ptf.GammaMean_.clone()),
+    a_(ptf.a_.clone()),
+    omega_(ptf.omega_.clone())
 {}
 
 
@@ -89,9 +89,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
 :
     fixedValueFvPatchVectorField(fmfrpvf),
     filmRegionName_(fmfrpvf.filmRegionName_),
-    GammaMean_(fmfrpvf.GammaMean_, false),
-    a_(fmfrpvf.a_, false),
-    omega_(fmfrpvf.omega_, false)
+    GammaMean_(fmfrpvf.GammaMean_.clone()),
+    a_(fmfrpvf.a_.clone()),
+    omega_(fmfrpvf.omega_.clone())
 {}
 
 
@@ -104,9 +104,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
 :
     fixedValueFvPatchVectorField(fmfrpvf, iF),
     filmRegionName_(fmfrpvf.filmRegionName_),
-    GammaMean_(fmfrpvf.GammaMean_, false),
-    a_(fmfrpvf.a_, false),
-    omega_(fmfrpvf.omega_, false)
+    GammaMean_(fmfrpvf.GammaMean_.clone()),
+    a_(fmfrpvf.a_.clone()),
+    omega_(fmfrpvf.omega_.clone())
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index 2619ccf1c6..2a3983eb55 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -172,7 +172,7 @@ inline const volScalarField& kinematicSingleLayer::muPrimary() const
 
 inline const filmThermoModel& kinematicSingleLayer::filmThermo() const
 {
-    return filmThermo_();
+    return *filmThermo_;
 }
 
 
@@ -190,7 +190,7 @@ inline transferModelList& kinematicSingleLayer::transfer()
 
 inline const filmTurbulenceModel& kinematicSingleLayer::turbulence() const
 {
-    return turbulence_();
+    return *turbulence_;
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index 5597b87182..c211c7ed92 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -133,25 +133,25 @@ inline const PtrList<volScalarField>& thermoSingleLayer::YPrimary() const
 
 inline const heatTransferModel& thermoSingleLayer::htcs() const
 {
-    return htcs_();
+    return *htcs_;
 }
 
 
 inline const heatTransferModel& thermoSingleLayer::htcw() const
 {
-    return htcw_();
+    return *htcw_;
 }
 
 
 inline const phaseChangeModel& thermoSingleLayer::phaseChange() const
 {
-    return phaseChange_();
+    return *phaseChange_;
 }
 
 
 inline const filmRadiationModel& thermoSingleLayer::radiation() const
 {
-    return radiation_();
+    return *radiation_;
 }
 
 
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 6147587600..ec37bb8cf9 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -348,7 +348,7 @@ const volScalarField& thermalBaffle::T() const
 
 const solidThermo& thermalBaffle::thermo() const
 {
-    return thermo_;
+    return *thermo_;
 }
 
 
diff --git a/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H b/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H
index dee27aec8c..fa9a444d8c 100644
--- a/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H
+++ b/src/rigidBodyDynamics/bodies/compositeBody/compositeBodyI.H
@@ -39,7 +39,7 @@ inline Foam::RBD::compositeBody::compositeBody
 
 inline const Foam::RBD::rigidBody& Foam::RBD::compositeBody::body() const
 {
-    return body_();
+    return *body_;
 }
 
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index 767ffc9612..103330d58e 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -50,7 +50,7 @@ inline Foam::autoPtr<Foam::RBD::subBody> Foam::RBD::subBody::clone() const
 
 inline const Foam::RBD::rigidBody& Foam::RBD::subBody::body() const
 {
-    return body_();
+    return *body_;
 }
 
 
diff --git a/src/rigidBodyDynamics/joints/floating/floatingJoint.C b/src/rigidBodyDynamics/joints/floating/floatingJoint.C
index 766e6504f6..909ccde0a1 100644
--- a/src/rigidBodyDynamics/joints/floating/floatingJoint.C
+++ b/src/rigidBodyDynamics/joints/floating/floatingJoint.C
@@ -54,8 +54,7 @@ namespace joints
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::RBD::joints::composite>
-Foam::RBD::joints::floating::sixDoF()
+Foam::RBD::joints::composite Foam::RBD::joints::floating::sixDoF()
 {
     PtrList<joint> cj(2);
     cj.set(0, new joints::Pxyz());
@@ -67,7 +66,7 @@ Foam::RBD::joints::floating::sixDoF()
     // Alternatively the Euler-angle joint can be used
     cj.set(1, new joints::Rzyx());
 
-    return autoPtr<composite>(new composite(cj));
+    return composite(cj);
 }
 
 
@@ -81,7 +80,7 @@ Foam::RBD::joints::floating::floating()
 
 Foam::RBD::joints::floating::floating(const dictionary& dict)
 :
-    composite(sixDoF())
+    floating()
 {}
 
 
@@ -91,12 +90,6 @@ Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joints::floating::clone() const
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::RBD::joints::floating::~floating()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::RBD::joints::floating::write(Ostream& os) const
diff --git a/src/rigidBodyDynamics/joints/floating/floatingJoint.H b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
index 7850777559..b1a7f745ab 100644
--- a/src/rigidBodyDynamics/joints/floating/floatingJoint.H
+++ b/src/rigidBodyDynamics/joints/floating/floatingJoint.H
@@ -68,7 +68,7 @@ class floating
     // Private member functions
 
         //- Return a list of joints needed to emulate a floating body
-        static autoPtr<composite> sixDoF();
+        static composite sixDoF();
 
 
 public:
@@ -90,7 +90,7 @@ public:
 
 
     //- Destructor
-    virtual ~floating();
+    virtual ~floating() = default;
 
 
     // Member Functions
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index e6cb7c9f95..3acf80c916 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -130,7 +130,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
     }
     else
     {
-        ramp_ = new Function1Types::OneConstant<scalar>("ramp");
+        ramp_.reset(new Function1Types::OneConstant<scalar>("ramp"));
     }
 
     const dictionary& bodiesDict = coeffDict().subDict("bodies");
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 1f146c9a86..079ee5fe1a 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -217,7 +217,7 @@ public:
         autoPtr<sampledSet> clone() const
         {
             NotImplemented;
-            return autoPtr<sampledSet>(nullptr);
+            return autoPtr<sampledSet>();
         }
 
 
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 8a7a0507d7..138d9d49d6 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -209,12 +209,10 @@ public:
         {
             if (cell_)
             {
-                return isoSurfCellPtr_();
-            }
-            else
-            {
-                return isoSurfPtr_();
+                return *isoSurfCellPtr_;
             }
+
+            return *isoSurfPtr_;
         }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index 1f7c2cb1bd..97a2d5eb39 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -157,7 +157,7 @@ public:
 
         const isoSurface& surface() const
         {
-            return surfPtr_();
+            return *surfPtr_;
         }
 
         //- Does the surface need an update?
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index 756ee7ba9d..1b868d2a6c 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -141,7 +141,7 @@ public:
         //const isoSurfaceCell& surface() const
         const isoSurface& surface() const
         {
-            return isoSurfPtr_();
+            return *isoSurfPtr_;
         }
 
         //- Does the surface need an update?
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index f0148f8ca6..1080c96d5d 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -205,7 +205,7 @@ public:
         autoPtr<sampledSurface> clone() const
         {
             NotImplemented;
-            return autoPtr<sampledSurface>(nullptr);
+            return autoPtr<sampledSurface>();
         }
 
 
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 8c73665838..0421ee931d 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -158,7 +158,7 @@ Foam::sampledTriSurfaceMesh::nonCoupledboundaryTree() const
         );
     }
 
-    return boundaryTreePtr_();
+    return *boundaryTreePtr_;
 }
 
 
diff --git a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.H b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.H
index c8edec3b69..a4f8d5c45f 100644
--- a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.H
+++ b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.H
@@ -181,7 +181,7 @@ public:
         autoPtr<surfMeshSampler> clone() const
         {
             NotImplemented;
-            return autoPtr<surfMeshSampler>(nullptr);
+            return autoPtr<surfMeshSampler>();
         }
 
 
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
index f41c323a6d..e04f2b8abd 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@@ -152,7 +152,7 @@ Foam::discreteSurface::nonCoupledboundaryTree() const
         );
     }
 
-    return boundaryTreePtr_();
+    return *boundaryTreePtr_;
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 53b0d33146..8e51d68c7d 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -123,7 +123,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
     momentOfInertia_(dict.lookup("momentOfInertia")),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
     aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
-    report_(dict.lookupOrDefault<Switch>("report", false)),
+    report_(dict.lookupOrDefault("report", false)),
     solver_(sixDoFSolver::New(dict.subDict("solver"), *this))
 {
     addRestraints(dict);
@@ -171,14 +171,14 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
     aRelax_(sDoFRBM.aRelax_),
     aDamp_(sDoFRBM.aDamp_),
     report_(sDoFRBM.report_),
-    solver_(sDoFRBM.solver_, false)
+    solver_(sDoFRBM.solver_.clone())
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::sixDoFRigidBodyMotion::~sixDoFRigidBodyMotion()
-{}
+{} // Define here (incomplete type in header)
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
index dc1e864ecc..1d5a1e9993 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
@@ -111,8 +111,8 @@ class sixDoFRigidBodyMotion
         //- Acceleration damping coefficient (for steady-state simulations)
         scalar aDamp_;
 
-        //- Switch to turn reporting of motion data on and off
-        Switch report_;
+        //- Reporting of motion data (on or off)
+        bool report_;
 
         //- Motion solver
         autoPtr<sixDoFSolver> solver_;
diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
index a77e0dc024..7a88136a8e 100644
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
@@ -57,7 +57,6 @@ Foam::functionObjects::sixDoFRigidBodyState::angleTypeNames_
 };
 
 
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::functionObjects::sixDoFRigidBodyState::writeFileHeader(Ostream& os)
@@ -93,12 +92,6 @@ Foam::functionObjects::sixDoFRigidBodyState::sixDoFRigidBodyState
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::functionObjects::sixDoFRigidBodyState::~sixDoFRigidBodyState()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::functionObjects::sixDoFRigidBodyState::read(const dictionary& dict)
diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
index e35e14044a..c260dbb4d0 100644
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
@@ -129,7 +129,7 @@ public:
 
 
     //- Destructor
-    virtual ~sixDoFRigidBodyState();
+    virtual ~sixDoFRigidBodyState() = default;
 
 
     // Member Functions
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index 40a4348654..95685f11c2 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.H
@@ -115,7 +115,7 @@ public:
         autoPtr<surfZone> clone() const
         {
             NotImplemented;
-            return autoPtr<surfZone>(nullptr);
+            return autoPtr<surfZone>();
         }
 
         static autoPtr<surfZone> New(Istream& is)
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
index b307c820c5..9b32adcd51 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
@@ -127,7 +127,7 @@ const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const
             << abort(FatalError);
     }
 
-    return liquids_();
+    return *liquids_;
 }
 
 
@@ -140,7 +140,7 @@ const Foam::solidMixtureProperties& Foam::SLGThermo::solids() const
             << abort(FatalError);
     }
 
-    return solids_();
+    return *solids_;
 }
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelI.H
index b34e0b10b3..511d1a906c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelI.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelI.H
@@ -27,13 +27,13 @@ License
 
 inline Foam::psiReactionThermo& Foam::psiChemistryModel::thermo()
 {
-    return thermo_();
+    return *thermo_;
 }
 
 
 inline const Foam::psiReactionThermo& Foam::psiChemistryModel::thermo() const
 {
-    return thermo_();
+    return *thermo_;
 }
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelI.H
index 9664bd7746..9553c80d32 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelI.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelI.H
@@ -27,13 +27,13 @@ License
 
 inline Foam::rhoReactionThermo& Foam::rhoChemistryModel::thermo()
 {
-    return thermo_();
+    return *thermo_;
 }
 
 
 inline const Foam::rhoReactionThermo& Foam::rhoChemistryModel::thermo() const
 {
-    return thermo_();
+    return *thermo_;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 3250cc66b0..fcd820e252 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -75,7 +75,7 @@ void Foam::radiation::fvDOM::initialise()
                         deltaPhi,
                         deltaTheta,
                         nLambda_,
-                        absorptionEmission_,
+                        *absorptionEmission_,
                         blackBody_,
                         i
                     )
@@ -108,7 +108,7 @@ void Foam::radiation::fvDOM::initialise()
                     deltaPhi,
                     deltaTheta,
                     nLambda_,
-                    absorptionEmission_,
+                    *absorptionEmission_,
                     blackBody_,
                     i
                 )
@@ -140,7 +140,7 @@ void Foam::radiation::fvDOM::initialise()
                     deltaPhi,
                     deltaTheta,
                     nLambda_,
-                    absorptionEmission_,
+                    *absorptionEmission_,
                     blackBody_,
                     i
                 )
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
index b8de0f96bc..a306956653 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
@@ -275,7 +275,7 @@ Foam::radiation::radiationModel::absorptionEmission() const
             << "not activate" << abort(FatalError);
     }
 
-    return absorptionEmission_();
+    return *absorptionEmission_;
 }
 
 
@@ -289,7 +289,7 @@ Foam::radiation::radiationModel::soot() const
             << "not activate" << abort(FatalError);
     }
 
-    return soot_();
+    return *soot_;
 }
 
 
@@ -303,7 +303,7 @@ Foam::radiation::radiationModel::transmissivity() const
             << "not activate" << abort(FatalError);
     }
 
-    return transmissivity_();
+    return *transmissivity_;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 12569bda35..6d9ef2a18d 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -131,14 +131,14 @@ Foam::radiation::boundaryRadiationPropertiesPatch::
 const Foam::radiation::absorptionEmissionModel&
 Foam::radiation::boundaryRadiationPropertiesPatch::absorptionEmission() const
 {
-    return absorptionEmission_();
+    return *absorptionEmission_;
 }
 
 
 const Foam::radiation::transmissivityModel&
 Foam::radiation::boundaryRadiationPropertiesPatch::transmissiveModel() const
 {
-    return transmissivity_();
+    return *transmissivity_;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index fb9b8eb6a7..4f99f59c92 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -296,7 +296,7 @@ public:
             //- Return coordinateSystem
             const coordinateSystem& coord()
             {
-                return coord_();
+                return *coord_;
             }
 
             //- Return sunTrackingUpdateInterval
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelI.H
index 48aa40841f..d425477c04 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelI.H
@@ -27,14 +27,14 @@ License
 
 inline Foam::solidReactionThermo& Foam::basicSolidChemistryModel::solidThermo()
 {
-    return solidThermo_();
+    return *solidThermo_;
 }
 
 
 inline const Foam::solidReactionThermo&
 Foam::basicSolidChemistryModel::solidThermo() const
 {
-    return solidThermo_();
+    return *solidThermo_;
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H
index 16aa85ee1a..dfe42cf57d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H
@@ -30,7 +30,7 @@ inline const ThermophysicalProperties&
 Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>
 ::properties() const
 {
-    return propertiesPtr_();
+    return *propertiesPtr_;
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 3f7bf842d0..bfcf0d4368 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -183,7 +183,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     qrNbrName_(psf.qrNbrName_),
     qrName_(psf.qrName_),
     specieName_(psf.specieName_),
-    liquid_(psf.liquid_, false),
+    liquid_(psf.liquid_.clone()),
     liquidDict_(psf.liquidDict_),
     mass_(psf.mass_, mapper),
     Tvap_(psf.Tvap_),
@@ -342,7 +342,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     qrNbrName_(psf.qrNbrName_),
     qrName_(psf.qrName_),
     specieName_(psf.specieName_),
-    liquid_(psf.liquid_, false),
+    liquid_(psf.liquid_.clone()),
     liquidDict_(psf.liquidDict_),
     mass_(psf.mass_),
     Tvap_(psf.Tvap_),
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index f1552e2905..8f4136f3c0 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -108,7 +108,7 @@ public:
         //- Return coordinate system
         const coordinateSystem& cs() const
         {
-            return csPtr_();
+            return *csPtr_;
         }
 
         //- Update the mesh for both mesh motion and topology change
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
index 7821b2d9fb..6b69e96c1b 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H
@@ -103,13 +103,13 @@ public:
         //- Return const-access to phase1 viscosityModel
         const viscosityModel& nuModel1() const
         {
-            return nuModel1_();
+            return *nuModel1_;
         }
 
         //- Return const-access to phase2 viscosityModel
         const viscosityModel& nuModel2() const
         {
-            return nuModel2_();
+            return *nuModel2_;
         }
 
         //- Return const-access to phase1 density
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index 8dfa30a477..1c1714285f 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -70,7 +70,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
 :
     alphaContactAngleFvPatchScalarField(psf, p, iF, mapper),
     TName_(psf.TName_),
-    theta0_(psf.theta0_, false)
+    theta0_(psf.theta0_.clone())
 {}
 
 
@@ -82,7 +82,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
 :
     alphaContactAngleFvPatchScalarField(psf),
     TName_(psf.TName_),
-    theta0_(psf.theta0_, false)
+    theta0_(psf.theta0_.clone())
 {}
 
 
@@ -95,7 +95,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
 :
     alphaContactAngleFvPatchScalarField(psf, iF),
     TName_(psf.TName_),
-    theta0_(psf.theta0_, false)
+    theta0_(psf.theta0_.clone())
 {}
 
 

From 52b36f84b53d0a028a719e00db5aca2a8fff4886 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 26 Feb 2018 12:05:00 +0100
Subject: [PATCH 10/13] ENH: cleanup tmp class (issue #639)

Improve alignment of its behaviour with std::shared_ptr

  - element_type typedef
  - swap, reset methods

* additional reference access methods:

cref()
    returns a const reference, synonymous with operator().
    This provides a more verbose alternative to using the '()' operator
    when that is desired.

        Mnemonic: a const form of 'ref()'

constCast()
    returns a non-const reference, regardless if the underlying object
    itself is a managed pointer or a const object.
    This is similar to ref(), but more permissive.

        Mnemonic: const_cast<>

    Using the constCast() method greatly reduces the amount of typing
    and reading. And since the data type is already defined via the tmp
    template parameter, the type deduction is automatically known.

    Previously,

        const tmp<volScalarField>& tfld;

        const_cast<volScalarField&>(tfld()).rename("name");
        volScalarField& fld = const_cast<volScalarField&>(tfld());

    Now,

        tfld.constCast().rename("name");
        auto& fld = tfld.constCast();

--

BUG: attempts to move tmp value that may still be shared.

- old code simply checked isTmp() to decide if the contents could be
  transfered. However, this means that the content of a shared tmp
  would be removed, leaving other instances without content.

* movable() method checks that for a non-null temporary that is
  unique (not shared).
---
 applications/test/tmp/Make/files              |   3 +
 .../test/{tmpField => tmp}/Make/options       |   0
 .../Test-tmpField.C => tmp/Test-tmp.C}        |  47 +++-
 applications/test/tmpField/Make/files         |   3 -
 .../DimensionedField/DimensionedField.C       |  18 +-
 .../DimensionedFieldReuseFunctions.H          | 186 +++++++------
 .../FieldFields/FieldField/FieldField.C       |   6 +-
 .../FieldField/FieldFieldReuseFunctions.H     |  72 +++--
 src/OpenFOAM/fields/Fields/Field/Field.C      |   2 +-
 .../fields/Fields/Field/FieldReuseFunctions.H |  40 ++-
 .../GeometricField/GeometricField.C           |  29 +-
 .../GeometricField/GeometricField.H           |  26 +-
 .../GeometricFieldReuseFunctions.H            | 207 +++++++-------
 .../lduMatrix/lduMatrix/lduMatrixTemplates.C  |  14 +-
 src/OpenFOAM/memory/refCount/refCount.H       |   4 +
 src/OpenFOAM/memory/tmp/tmp.H                 | 200 ++++++++++----
 src/OpenFOAM/memory/tmp/tmpI.H                | 252 ++++++++++++------
 src/OpenFOAM/memory/tmp/tmpNrc.H              | 214 +++++++++++++++
 src/OpenFOAM/memory/{tmpNrc => tmp}/tmpNrcI.H | 180 ++++++++-----
 src/OpenFOAM/memory/tmpNrc/tmpNrc.H           | 171 ------------
 .../functions/Function1/Function1/Function1.C |   6 +-
 .../schemes/DEShybrid/DEShybrid.H             |  23 +-
 .../LES/LESfilters/LESfilter/LESfilter.H      |   2 +-
 .../lnGradSchemes/lnGradScheme/lnGradScheme.H |   2 +-
 .../edgeInterpolationScheme.H                 |   2 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  12 +-
 .../regionCoupled/regionCoupledFvPatch.C      |   7 +-
 .../regionCoupled/regionCoupledWallFvPatch.C  |   6 +-
 .../ReynoldsAnalogy/ReynoldsAnalogy.C         |  24 +-
 .../solidificationMeltingSource.C             |   2 +-
 .../MPPIC/ParticleStressModels/Lun/Lun.C      |   3 +-
 .../DispersionRASModel/DispersionRASModel.C   |  28 +-
 .../BrownianMotion/BrownianMotionForce.C      |  14 +-
 .../EulerCoordinateRotation.C                 |   8 +-
 .../STARCDCoordinateRotation.C                |   8 +-
 .../coordinateRotation/axesRotation.C         |   4 +-
 .../sampledSurface/sampledSurface.C           |  10 +-
 .../submodels/sootModel/noSoot/noSoot.C       |   2 +-
 .../basicSolidChemistryModel.C                |   4 +-
 .../waveAlpha/waveAlphaFvPatchScalarField.C   |   4 +-
 .../waveVelocityFvPatchVectorField.C          |   4 +-
 41 files changed, 1034 insertions(+), 815 deletions(-)
 create mode 100644 applications/test/tmp/Make/files
 rename applications/test/{tmpField => tmp}/Make/options (100%)
 rename applications/test/{tmpField/Test-tmpField.C => tmp/Test-tmp.C} (59%)
 delete mode 100644 applications/test/tmpField/Make/files
 create mode 100644 src/OpenFOAM/memory/tmp/tmpNrc.H
 rename src/OpenFOAM/memory/{tmpNrc => tmp}/tmpNrcI.H (72%)
 delete mode 100644 src/OpenFOAM/memory/tmpNrc/tmpNrc.H

diff --git a/applications/test/tmp/Make/files b/applications/test/tmp/Make/files
new file mode 100644
index 0000000000..5b4ecf10aa
--- /dev/null
+++ b/applications/test/tmp/Make/files
@@ -0,0 +1,3 @@
+Test-tmp.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-tmp
diff --git a/applications/test/tmpField/Make/options b/applications/test/tmp/Make/options
similarity index 100%
rename from applications/test/tmpField/Make/options
rename to applications/test/tmp/Make/options
diff --git a/applications/test/tmpField/Test-tmpField.C b/applications/test/tmp/Test-tmp.C
similarity index 59%
rename from applications/test/tmpField/Test-tmpField.C
rename to applications/test/tmp/Test-tmp.C
index 6896344ec5..73ba236063 100644
--- a/applications/test/tmpField/Test-tmpField.C
+++ b/applications/test/tmp/Test-tmp.C
@@ -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.
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    tmpFieldTest
+    Test-tmp
 
 Description
-    Tests for possible memory leaks in the tmp<Field> algebra.
+    Tests for possible memory leaks in the tmp (and tmp<Field> algebra).
 
 \*---------------------------------------------------------------------------*/
 
@@ -33,19 +33,50 @@ Description
 
 using namespace Foam;
 
+struct myScalarField : public scalarField
+{
+    using scalarField::scalarField;
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main()
 {
-    scalarField f1(1000000, 1.0), f2(1000000, 2.0), f3(1000000, 3.0);
-
-    for (;;)
     {
-        f1 = f2 + f3 + f2 + f3;
+        scalarField f1(1000000, 1.0), f2(1000000, 2.0), f3(1000000, 3.0);
+
+        for (int iter=0; iter < 50; ++iter)
+        {
+            f1 = f2 + f3 + f2 + f3;
+        }
+
+        Info<<"f1 = " << f1 << nl;
     }
 
-    Info<< "end" << endl;
+    {
+        tmp<scalarField> tfld1 = tmp<scalarField>::New(20, Zero);
+
+        Info<< "tmp refCount = " << tfld1->count() << nl;
+        if (tfld1.valid())
+        {
+            Info<<"tmp: " << tfld1() << nl;
+        }
+    }
+
+    {
+        tmp<scalarField> tfld2 =
+            tmp<scalarField>::NewFrom<myScalarField>(20, Zero);
+
+        Info<< "tmp refCount = " << tfld2->count() << nl;
+        if (tfld2.valid())
+        {
+            Info<<"tmp: " << tfld2() << nl;
+        }
+    }
+
+    Info<< "\nEnd" << endl;
 }
 
 
diff --git a/applications/test/tmpField/Make/files b/applications/test/tmpField/Make/files
deleted file mode 100644
index c3dd60a71d..0000000000
--- a/applications/test/tmpField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-tmpField.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-tmpField
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index e4717cd7fe..f2f54f3270 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -217,12 +217,8 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
-    regIOobject(tdf(), tdf.isTmp()),
-    Field<Type>
-    (
-        const_cast<DimensionedField<Type, GeoMesh>&>(tdf()),
-        tdf.isTmp()
-    ),
+    regIOobject(tdf.constCast(), tdf.movable()),
+    Field<Type>(tdf.constCast(), tdf.movable()),
     mesh_(tdf().mesh_),
     dimensions_(tdf().dimensions_),
     oriented_(tdf().oriented_)
@@ -318,11 +314,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 )
 :
     regIOobject(newName, tdf(), true),
-    Field<Type>
-    (
-        const_cast<DimensionedField<Type, GeoMesh>&>(tdf()),
-        tdf.isTmp()
-    ),
+    Field<Type>(tdf.constCast(), tdf.movable()),
     mesh_(tdf().mesh_),
     dimensions_(tdf().dimensions_),
     oriented_(tdf().oriented_)
@@ -511,7 +503,7 @@ void DimensionedField<Type, GeoMesh>::operator=
     const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    auto& df = tdf.constCast();
 
     // Check for assignment to self
     if (this == &df)
@@ -525,7 +517,7 @@ void DimensionedField<Type, GeoMesh>::operator=
 
     dimensions_ = df.dimensions();
     oriented_ = df.oriented();
-    this->transfer(const_cast<DimensionedField<Type, GeoMesh>&>(df));
+    this->transfer(df);
     tdf.clear();
 }
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 3cf47f0cd5..967eace9ad 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.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.
@@ -41,32 +41,31 @@ tmp<DimensionedField<TypeR, GeoMesh>> New
     const dimensionSet& dimensions
 )
 {
-    DimensionedField<TypeR, GeoMesh>& df1 =
-        const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
-
     if (tdf1.isTmp())
     {
+        auto& df1 = tdf1.constCast();
+
         df1.rename(name);
         df1.dimensions().reset(dimensions);
         return tdf1;
     }
-    else
-    {
-        return tmp<DimensionedField<TypeR, GeoMesh>>
+
+    const auto& df1 = tdf1();
+
+    return tmp<DimensionedField<TypeR, GeoMesh>>
+    (
+        new DimensionedField<TypeR, GeoMesh>
         (
-            new DimensionedField<TypeR, GeoMesh>
+            IOobject
             (
-                IOobject
-                (
-                    name,
-                    df1.instance(),
-                    df1.db()
-                ),
-                df1.mesh(),
-                dimensions
-            )
-        );
-    }
+                name,
+                df1.instance(),
+                df1.db()
+            ),
+            df1.mesh(),
+            dimensions
+        )
+    );
 }
 
 
@@ -82,7 +81,7 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
+        const auto& df1 = tdf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>
         (
@@ -114,32 +113,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
-
         if (tdf1.isTmp())
         {
+            auto& df1 = tdf1.constCast();
+
             df1.rename(name);
             df1.dimensions().reset(dimensions);
             return tdf1;
         }
-        else
-        {
-            return tmp<DimensionedField<TypeR, GeoMesh>>
+
+        const auto& df1 = tdf1();
+
+        return tmp<DimensionedField<TypeR, GeoMesh>>
+        (
+            new DimensionedField<TypeR, GeoMesh>
             (
-                new DimensionedField<TypeR, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        df1.instance(),
-                        df1.db()
-                    ),
-                    df1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    df1.instance(),
+                    df1.db()
+                ),
+                df1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -157,7 +155,7 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
+        const auto& df1 = tdf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>
         (
@@ -190,33 +188,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
-        DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
-
         if (tdf2.isTmp())
         {
+            auto& df2 = tdf2.constCast();
+
             df2.rename(name);
             df2.dimensions().reset(dimensions);
             return tdf2;
         }
-        else
-        {
-            return tmp<DimensionedField<TypeR, GeoMesh>>
+
+        const auto& df1 = tdf1();
+
+        return tmp<DimensionedField<TypeR, GeoMesh>>
+        (
+            new DimensionedField<TypeR, GeoMesh>
             (
-                new DimensionedField<TypeR, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        df1.instance(),
-                        df1.db()
-                    ),
-                    df1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    df1.instance(),
+                    df1.db()
+                ),
+                df1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -234,32 +230,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
-
         if (tdf1.isTmp())
         {
+            auto& df1 = tdf1.constCast();
+
             df1.rename(name);
             df1.dimensions().reset(dimensions);
             return tdf1;
         }
-        else
-        {
-            return tmp<DimensionedField<TypeR, GeoMesh>>
+
+        const auto& df1 = tdf1();
+
+        return tmp<DimensionedField<TypeR, GeoMesh>>
+        (
+            new DimensionedField<TypeR, GeoMesh>
             (
-                new DimensionedField<TypeR, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        df1.instance(),
-                        df1.db()
-                    ),
-                    df1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    df1.instance(),
+                    df1.db()
+                ),
+                df1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -277,40 +272,39 @@ public:
         const dimensionSet& dimensions
     )
     {
-        DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
-        DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
-
         if (tdf1.isTmp())
         {
+            auto& df1 = tdf1.constCast();
+
             df1.rename(name);
             df1.dimensions().reset(dimensions);
             return tdf1;
         }
         else if (tdf2.isTmp())
         {
+            auto& df2 = tdf2.constCast();
+
             df2.rename(name);
             df2.dimensions().reset(dimensions);
             return tdf2;
         }
-        else
-        {
-            return tmp<DimensionedField<TypeR, GeoMesh>>
+
+        const auto& df1 = tdf1();
+
+        return tmp<DimensionedField<TypeR, GeoMesh>>
+        (
+            new DimensionedField<TypeR, GeoMesh>
             (
-                new DimensionedField<TypeR, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        df1.instance(),
-                        df1.db()
-                    ),
-                    df1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    df1.instance(),
+                    df1.db()
+                ),
+                df1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 940afea59b..48610c8f97 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -160,11 +160,7 @@ FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& tl)
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
 :
-    PtrList<Field<Type>>
-    (
-        const_cast<FieldField<Field, Type>&>(tf()),
-        tf.isTmp()
-    )
+    PtrList<Field<Type>>(tf.constCast(), tf.movable())
 {
     tf.clear();
 }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index 0006d9aa01..43383f1eb5 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.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.
@@ -44,20 +44,18 @@ tmp<FieldField<Field, TypeR>> New
     {
         return tf1;
     }
-    else
+
+    tmp<FieldField<Field, TypeR>> rtf
+    (
+        FieldField<Field, TypeR>::NewCalculatedType(tf1())
+    );
+
+    if (initRet)
     {
-        tmp<FieldField<Field, TypeR>> rtf
-        (
-            FieldField<Field, TypeR>::NewCalculatedType(tf1())
-        );
-
-        if (initRet)
-        {
-            rtf.ref() = tf1();
-        }
-
-        return rtf;
+        rtf.ref() = tf1();
     }
+
+    return rtf;
 }
 
 
@@ -93,13 +91,11 @@ public:
         {
             return tf1;
         }
-        else
-        {
-            return tmp<FieldField<Field, TypeR>>
-            (
-                FieldField<Field, TypeR>::NewCalculatedType(tf1())
-            );
-        }
+
+        return tmp<FieldField<Field, TypeR>>
+        (
+            FieldField<Field, TypeR>::NewCalculatedType(tf1())
+        );
     }
 };
 
@@ -145,13 +141,11 @@ public:
         {
             return tf2;
         }
-        else
-        {
-            return tmp<FieldField<Field, TypeR>>
-            (
-                FieldField<Field, TypeR>::NewCalculatedType(tf1())
-            );
-        }
+
+        return tmp<FieldField<Field, TypeR>>
+        (
+            FieldField<Field, TypeR>::NewCalculatedType(tf1())
+        );
     }
 };
 
@@ -171,13 +165,11 @@ public:
         {
             return tf1;
         }
-        else
-        {
-            return tmp<FieldField<Field, TypeR>>
-            (
-                FieldField<Field, TypeR>::NewCalculatedType(tf1())
-            );
-        }
+
+        return tmp<FieldField<Field, TypeR>>
+        (
+            FieldField<Field, TypeR>::NewCalculatedType(tf1())
+        );
     }
 };
 
@@ -201,13 +193,11 @@ public:
         {
             return tf2;
         }
-        else
-        {
-            return tmp<FieldField<Field, TypeR>>
-            (
-                FieldField<Field, TypeR>::NewCalculatedType(tf1())
-            );
-        }
+
+        return tmp<FieldField<Field, TypeR>>
+        (
+            FieldField<Field, TypeR>::NewCalculatedType(tf1())
+        );
     }
 };
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index eaaf483064..321fdb1029 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -256,7 +256,7 @@ Foam::Field<Type>::Field(const UIndirectList<Type>& list)
 template<class Type>
 Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
 :
-    List<Type>(const_cast<Field<Type>&>(tf()), tf.isTmp())
+    List<Type>(tf.constCast(), tf.movable())
 {
     tf.clear();
 }
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index fac9e9a51c..3818628c3e 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -44,17 +44,15 @@ tmp<Field<TypeR>> New
     {
         return tf1;
     }
-    else
+
+    tmp<Field<TypeR>> rtf(new Field<TypeR>(tf1().size()));
+
+    if (initRet)
     {
-        tmp<Field<TypeR>> rtf(new Field<TypeR>(tf1().size()));
-
-        if (initRet)
-        {
-            rtf.ref() = tf1();
-        }
-
-        return rtf;
+        rtf.ref() = tf1();
     }
+
+    return rtf;
 }
 
 
@@ -81,10 +79,8 @@ public:
         {
             return tf1;
         }
-        else
-        {
-            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
-        }
+
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 };
 
@@ -120,10 +116,8 @@ public:
         {
             return tf2;
         }
-        else
-        {
-            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
-        }
+
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 };
 
@@ -143,10 +137,8 @@ public:
         {
             return tf1;
         }
-        else
-        {
-            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
-        }
+
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 };
 
@@ -170,10 +162,8 @@ public:
         {
             return tf2;
         }
-        else
-        {
-            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
-        }
+
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 };
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 6f2c45eb6f..6fd5a97ce5 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -455,11 +455,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
-    Internal
-    (
-        const_cast<GeometricField<Type, PatchField, GeoMesh>&>(tgf()),
-        tgf.isTmp()
-    ),
+    Internal(tgf.constCast(), tgf.movable()),
     timeIndex_(tgf().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -517,12 +513,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
-    Internal
-    (
-        io,
-        const_cast<GeometricField<Type, PatchField, GeoMesh>&>(tgf()),
-        tgf.isTmp()
-    ),
+    Internal(io, tgf.constCast(), tgf.movable()),
     timeIndex_(tgf().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -581,12 +572,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
-    Internal
-    (
-        newName,
-        const_cast<GeometricField<Type, PatchField, GeoMesh>&>(tgf()),
-        tgf.isTmp()
-    ),
+    Internal(newName, tgf.constCast(), tgf.movable()),
     timeIndex_(tgf().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -690,12 +676,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const wordList& actualPatchTypes
 )
 :
-    Internal
-    (
-        io,
-        const_cast<GeometricField<Type, PatchField, GeoMesh>&>(tgf()),
-        tgf.isTmp()
-    ),
+    Internal(io, tgf.constCast(), tgf.movable()),
     timeIndex_(tgf().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -1221,7 +1202,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
     this->dimensions() = gf.dimensions();
     this->oriented() = gf.oriented();
 
-    if (tgf.isTmp())
+    if (tgf.movable())
     {
         // Transfer the storage from the tmp
         primitiveFieldRef().transfer
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 3162084d4d..0b13a145b2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -125,16 +125,16 @@ public:
         // Constructors
 
             //- Construct from a BoundaryMesh
-            Boundary(const BoundaryMesh&);
+            Boundary(const BoundaryMesh& bmesh);
 
             //- Construct from a BoundaryMesh,
             //  reference to the internal field
             //  and a patch type
             Boundary
             (
-                const BoundaryMesh&,
-                const Internal&,
-                const word&
+                const BoundaryMesh& bmesh,
+                const Internal& field,
+                const word& patchFieldType
             );
 
             //- Construct from a BoundaryMesh,
@@ -143,8 +143,8 @@ public:
             //  types (to override constraint patches)
             Boundary
             (
-                const BoundaryMesh&,
-                const Internal&,
+                const BoundaryMesh& bmesh,
+                const Internal& field,
                 const wordList& wantedPatchTypes,
                 const wordList& actualPatchTypes = wordList()
             );
@@ -154,16 +154,16 @@ public:
             //  and a PtrList<PatchField<Type>>
             Boundary
             (
-                const BoundaryMesh&,
-                const Internal&,
+                const BoundaryMesh& bmesh,
+                const Internal& field,
                 const PtrList<PatchField<Type>>&
             );
 
             //- Construct as copy setting the reference to the internal field
             Boundary
             (
-                const Internal&,
-                const Boundary&
+                const Internal& field,
+                const Boundary& btf
             );
 
             //- Construct as copy
@@ -173,14 +173,14 @@ public:
             //  BoundaryField for which such operations are unavailable.
             Boundary
             (
-                const Boundary&
+                const Boundary& btf
             );
 
             //- Construct from dictionary
             Boundary
             (
-                const BoundaryMesh&,
-                const Internal&,
+                const BoundaryMesh& bmesh,
+                const Internal& field,
                 const dictionary&
             );
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index c6fb56706d..df17b18468 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.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,9 +45,8 @@ bool reusable(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
     {
         if (GeometricField<Type, PatchField, GeoMesh>::debug)
         {
-            const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
-            const typename GeometricField<Type, PatchField, GeoMesh>::
-                Boundary& gbf = gf.boundaryField();
+            const auto& gf = tgf();
+            const auto& gbf = gf.boundaryField();
 
             forAll(gbf, patchi)
             {
@@ -68,10 +67,8 @@ bool reusable(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
@@ -84,39 +81,38 @@ tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     const bool initRet = false
 )
 {
-    GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-        const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
-
     if (reusable(tgf1))
     {
+        auto& gf1 = tgf1.constCast();
+
         gf1.rename(name);
         gf1.dimensions().reset(dimensions);
         return tgf1;
     }
-    else
-    {
-        tmp<GeometricField<TypeR, PatchField, GeoMesh>> rtgf
+
+    const auto& gf1 = tgf1();
+
+    tmp<GeometricField<TypeR, PatchField, GeoMesh>> rtgf
+    (
+        new GeometricField<TypeR, PatchField, GeoMesh>
         (
-            new GeometricField<TypeR, PatchField, GeoMesh>
+            IOobject
             (
-                IOobject
-                (
-                    name,
-                    gf1.instance(),
-                    gf1.db()
-                ),
-                gf1.mesh(),
-                dimensions
-            )
-        );
+                name,
+                gf1.instance(),
+                gf1.db()
+            ),
+            gf1.mesh(),
+            dimensions
+        )
+    );
 
-        if (initRet)
-        {
-            rtgf.ref() == tgf1();
-        }
-
-        return rtgf;
+    if (initRet)
+    {
+        rtgf.ref() == gf1;
     }
+
+    return rtgf;
 }
 
 
@@ -138,7 +134,7 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
+        const auto& gf1 = tgf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
@@ -170,32 +166,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
-
         if (reusable(tgf1))
         {
+            auto& gf1 = tgf1.constCast();
+
             gf1.rename(name);
             gf1.dimensions().reset(dimensions);
             return tgf1;
         }
-        else
-        {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+
+        const auto& gf1 = tgf1();
+
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+        (
+            new GeometricField<TypeR, PatchField, GeoMesh>
             (
-                new GeometricField<TypeR, PatchField, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        gf1.instance(),
-                        gf1.db()
-                    ),
-                    gf1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    gf1.instance(),
+                    gf1.db()
+                ),
+                gf1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -221,7 +216,7 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
+        const auto& gf1 = tgf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
@@ -262,33 +257,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
-        GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
-
         if (reusable(tgf2))
         {
+            auto& gf2 = tgf2.constCast();
+
             gf2.rename(name);
             gf2.dimensions().reset(dimensions);
             return tgf2;
         }
-        else
-        {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+
+        const auto& gf1 = tgf1();
+
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+        (
+            new GeometricField<TypeR, PatchField, GeoMesh>
             (
-                new GeometricField<TypeR, PatchField, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        gf1.instance(),
-                        gf1.db()
-                    ),
-                    gf1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    gf1.instance(),
+                    gf1.db()
+                ),
+                gf1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -312,32 +305,31 @@ public:
         const dimensionSet& dimensions
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
-
         if (reusable(tgf1))
         {
+            auto& gf1 = tgf1.constCast();
+
             gf1.rename(name);
             gf1.dimensions().reset(dimensions);
             return tgf1;
         }
-        else
-        {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+
+        const auto& gf1 = tgf1();
+
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+        (
+            new GeometricField<TypeR, PatchField, GeoMesh>
             (
-                new GeometricField<TypeR, PatchField, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        gf1.instance(),
-                        gf1.db()
-                    ),
-                    gf1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    gf1.instance(),
+                    gf1.db()
+                ),
+                gf1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
@@ -355,40 +347,39 @@ public:
         const dimensionSet& dimensions
     )
     {
-        GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
-        GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
-
         if (reusable(tgf1))
         {
+            auto& gf1 = tgf1.constCast();
+
             gf1.rename(name);
             gf1.dimensions().reset(dimensions);
             return tgf1;
         }
         else if (reusable(tgf2))
         {
+            auto& gf2 = tgf2.constCast();
+
             gf2.rename(name);
             gf2.dimensions().reset(dimensions);
             return tgf2;
         }
-        else
-        {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+
+        const auto& gf1 = tgf1();
+
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
+        (
+            new GeometricField<TypeR, PatchField, GeoMesh>
             (
-                new GeometricField<TypeR, PatchField, GeoMesh>
+                IOobject
                 (
-                    IOobject
-                    (
-                        name,
-                        gf1.instance(),
-                        gf1.db()
-                    ),
-                    gf1.mesh(),
-                    dimensions
-                )
-            );
-        }
+                    name,
+                    gf1.instance(),
+                    gf1.db()
+                ),
+                gf1.mesh(),
+                dimensions
+            )
+        );
     }
 };
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index 0ac399fb59..9f28ad17cd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -98,15 +98,13 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
 
         return tfaceHpsi;
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Cannot calculate faceH"
-               " the matrix does not have any off-diagonal coefficients."
-            << exit(FatalError);
 
-        return tmp<Field<Type>>(nullptr);
-    }
+    FatalErrorInFunction
+        << "Cannot calculate faceH"
+           " the matrix does not have any off-diagonal coefficients."
+        << exit(FatalError);
+
+    return tmp<Field<Type>>();
 }
 
 
diff --git a/src/OpenFOAM/memory/refCount/refCount.H b/src/OpenFOAM/memory/refCount/refCount.H
index 1f90ba73a4..5b6e22c681 100644
--- a/src/OpenFOAM/memory/refCount/refCount.H
+++ b/src/OpenFOAM/memory/refCount/refCount.H
@@ -53,6 +53,10 @@ class refCount
 
 public:
 
+    //- A non-counting (dummy) refCount
+    struct zero {};
+
+
     // Constructors
 
         //- Construct null initializing count to 0
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 52dc896a83..736a7c4cca 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.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.
@@ -25,14 +25,19 @@ Class
     Foam::tmp
 
 Description
-    A class for managing temporary objects
+    A class for managing temporary objects.
+
+    This is a combination of std::shared_ptr (with intrusive ref-counting)
+    and a shared_ptr without ref-counting and null deleter.
+    This allows the tmp to double as a pointer management and an indirect
+    pointer to externally allocated objects.
 
 SourceFiles
     tmpI.H
 
 See also
-    Foam::refCount
     Foam::autoPtr
+    Foam::refCount
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,6 +46,7 @@ See also
 
 #include "refCount.H"
 #include "word.H"
+#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,111 +63,201 @@ class tmp
     // Private data
 
         //- Object types
-        enum type
+        enum refType
         {
-            TMP,
-            CONST_REF
+            PTR,    //!< Managing a (ref-counted) pointer
+            CREF    //!< Using a const-reference to an object
         };
 
-        //- Pointer to object
+        //- The managed pointer or the address of const-reference object
         mutable T* ptr_;
 
-        //- Type of object
-        type type_;
+        //- The type (managed pointer | const-reference object)
+        mutable refType type_;
 
 
-    // Private member operators
+    // Private Member Operators
 
+        //- Increment the ref-count for a managed pointer
         inline void operator++();
 
 
 public:
 
-    typedef T Type;
+    // STL type definitions
+
+        //- Type of object being managed or referenced
+        typedef T element_type;
+
+        //- Pointer to type of object being managed or referenced
+        typedef T* pointer;
+
+
+    //- Reference counter class
     typedef Foam::refCount refCount;
 
 
+    // Factory Methods
+
+        //- Construct tmp of T with forwarding arguments
+        //  \param args list of arguments with which an instance of T
+        //      will be constructed.
+        //
+        //  \note Similar to std::make_shared, but the overload for
+        //      array types is not disabled.
+        template<class... Args>
+        inline static tmp<T> New(Args&&... args);
+
+        //- Construct tmp from derived type with forwarding arguments
+        //  \param args list of arguments with which an instance of U
+        //      will be constructed.
+        //
+        //  \note Similar to New but for derived types
+        template<class U, class... Args>
+        inline static tmp<T> NewFrom(Args&&... args);
+
+
     // Constructors
 
-        //- Null pointer construct
-        inline tmp();
+        //- Construct with no managed pointer.
+        inline constexpr tmp() noexcept;
 
-        //- Store object pointer
+        //- Construct with no managed pointer.
+        inline constexpr tmp(std::nullptr_t) noexcept;
+
+        //- Construct, taking ownership of the pointer.
         inline explicit tmp(T* p);
 
-        //- Store object const reference
-        inline tmp(const T& t);
+        //- Construct for a const reference to an object.
+        inline tmp(const T& obj) noexcept;
 
-        //- Construct copy and increment reference count
+        //- Move construct, transferring ownership.
+        //  Does not affect ref-count
+        inline tmp(tmp<T>&& t) noexcept;
+
+        //- Move construct, transferring ownership.
+        //  Does not affect ref-count
+        //  \note Non-standard definition - should be non-const
+        inline tmp(const tmp<T>&& t) noexcept;
+
+        //- Copy construct, incrementing ref-count of managed pointer.
+        //  \note Non-standard definition - should be non-const
         inline tmp(const tmp<T>& t);
 
-        //- Construct copy moving content, does not increment reference count
-        inline tmp(const tmp<T>&& t);
-
-        //- Construct copy transferring content of temporary if required
-        inline tmp(const tmp<T>& t, bool allowTransfer);
+        //- Copy construct. Optionally reusing ref-counted pointer.
+        inline tmp(const tmp<T>& t, bool reuse);
 
 
-    //- Destructor: deletes temporary object when the reference count is 0
+    //- Destructor: deletes managed pointer when the ref-count is 0
     inline ~tmp();
 
 
     // Member Functions
 
-        // Access
+    // Query
 
-            //- Return true if this is really a temporary object
-            inline bool isTmp() const;
+        //- True if this is a managed pointer (not a const reference)
+        inline bool isTmp() const;
 
-            //- Return true if this temporary object empty,
-            //  ie, a temporary without allocation
-            inline bool empty() const;
+        //- True if this is a non-null managed pointer
+        inline bool empty() const;
 
-            //- Is this temporary object valid,
-            //  ie, it is a reference or a temporary that has been allocated
-            inline bool valid() const;
+        //- True if this is a non-null managed pointer,
+        //- or is a const object reference
+        inline bool valid() const;
 
-            //- Return the type name of the tmp
-            //  constructed from the type name of T
-            inline word typeName() const;
+        //- True if this is a non-null managed pointer with a unique ref-count
+        inline bool movable() const;
+
+        //- Return type-name of the tmp, constructed from type-name of T
+        inline word typeName() const;
 
 
-        // Edit
+    // Access
 
-            //- Return tmp pointer for reuse.
-            //  Returns a clone if the object is not a temporary
-            inline T* ptr() const;
+        //- Return the const object reference or a const reference to the
+        //- contents of a non-null managed pointer.
+        //  Fatal for a null managed pointer
+        inline const T& cref() const;
 
-            //- Return non-const reference. Fatal if the object is const.
-            inline T& ref() const;
+        //- Return non-const reference to the contents of a non-null
+        //- managed pointer.
+        //  Fatal for a null managed pointer or if the object is const.
+        inline T& ref() const;
 
-            //- If object pointer points to valid object:
-            //- delete object and set pointer to nullptr
-            inline void clear() const;
+        //- Non-const dereference, even if the object is const.
+        //  This is similar to ref(), but applies a const_cast to access
+        //  const objects.
+        //  Fatal for a null managed pointer.
+        inline T& constCast() const;
+
+
+    // Edit
+
+        //- Return managed pointer for reuse, or clone() the const object
+        //- reference.
+        inline T* ptr() const;
+
+        //- If object pointer points to valid object:
+        //- delete object and set pointer to nullptr
+        inline void clear() const;
+
+        //- Release ownership of managed temporary object.
+        //  After this call no object is managed.
+        inline void reset();
+
+        //- Delete managed temporary object and set to new given pointer
+        inline void reset(T* p);
+
+        //- Swaps the managed object with other tmp.
+        inline void swap(tmp<T>& other) noexcept;
 
 
     // Member operators
 
-        //- Const dereference operator
+        //- Return const reference to the object.
+        //  Identical to cref() method.
         inline const T& operator()() const;
 
-        //- Const cast to the underlying type reference
+        //- Cast to underlying data type, using the cref() method.
         inline operator const T&() const;
 
-        //- Return object pointer
-        inline T* operator->();
-
-        //- Return const object pointer
+        //- Dereferences (const) pointer to the managed object.
+        //  Fatal for a null managed pointer.
         inline const T* operator->() const;
 
-        //- Assignment to pointer changing this tmp to a temporary T
+        //- Dereferences (non-const) pointer to the managed object.
+        //  Fatal for a null managed pointer or if the object is const.
+        inline T* operator->();
+
+        //- Take ownership of the pointer.
+        //  Fatal for a null pointer, or when the pointer is non-unique.
         inline void operator=(T* p);
 
-        //- Assignment transferring the temporary T to this tmp
+        //- Transfer ownership of the managed pointer.
+        //  Fatal for a null managed pointer or if the object is const.
         inline void operator=(const tmp<T>& t);
+
+
+    // Housekeeping
+
+        //- Disallow assignment from literal nullptr.
+        //  Consistent with run-time check for nullptr on assignment.
+        void operator=(std::nullptr_t) = delete;
 };
 
 
+// Global Functions
+
+//- Specializes the Swap algorithm for tmp.
+//  Swaps the pointers and types of lhs and rhs. Calls \c lhs.swap(rhs)
+template<class T>
+void Swap(tmp<T>& lhs, tmp<T>& rhs)
+{
+    lhs.swap(rhs);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index c789bc0dbf..c2729bc1c7 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.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.
@@ -43,13 +43,39 @@ inline void Foam::tmp<T>::operator++()
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+template<class... Args>
+inline Foam::tmp<T> Foam::tmp<T>::New(Args&&... args)
+{
+    return tmp<T>(new T(std::forward<Args>(args)...));
+}
+
+
+template<class T>
+template<class U, class... Args>
+inline Foam::tmp<T> Foam::tmp<T>::NewFrom(Args&&... args)
+{
+    return tmp<T>(new U(std::forward<Args>(args)...));
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::tmp<T>::tmp()
+inline constexpr Foam::tmp<T>::tmp() noexcept
 :
     ptr_(nullptr),
-    type_(TMP)
+    type_(PTR)
+{}
+
+
+template<class T>
+inline constexpr Foam::tmp<T>::tmp(std::nullptr_t) noexcept
+:
+    ptr_(nullptr),
+    type_(PTR)
 {}
 
 
@@ -57,7 +83,7 @@ template<class T>
 inline Foam::tmp<T>::tmp(T* p)
 :
     ptr_(p),
-    type_(TMP)
+    type_(PTR)
 {
     if (p && !p->unique())
     {
@@ -70,13 +96,35 @@ inline Foam::tmp<T>::tmp(T* p)
 
 
 template<class T>
-inline Foam::tmp<T>::tmp(const T& t)
+inline Foam::tmp<T>::tmp(const T& obj) noexcept
 :
-    ptr_(const_cast<T*>(&t)),
-    type_(CONST_REF)
+    ptr_(const_cast<T*>(&obj)),
+    type_(CREF)
 {}
 
 
+template<class T>
+inline Foam::tmp<T>::tmp(tmp<T>&& t) noexcept
+:
+    ptr_(t.ptr_),
+    type_(t.type_)
+{
+    t.ptr_ = nullptr;
+    t.type_ = PTR;
+}
+
+
+template<class T>
+inline Foam::tmp<T>::tmp(const tmp<T>&& t) noexcept
+:
+    ptr_(t.ptr_),
+    type_(t.type_)
+{
+    t.ptr_ = nullptr;
+    t.type_ = PTR;
+}
+
+
 template<class T>
 inline Foam::tmp<T>::tmp(const tmp<T>& t)
 :
@@ -100,20 +148,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
 
 
 template<class T>
-inline Foam::tmp<T>::tmp(const tmp<T>&& t)
-:
-    ptr_(t.ptr_),
-    type_(t.type_)
-{
-    if (isTmp())
-    {
-        t.ptr_ = nullptr;
-    }
-}
-
-
-template<class T>
-inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
+inline Foam::tmp<T>::tmp(const tmp<T>& t, bool reuse)
 :
     ptr_(t.ptr_),
     type_(t.type_)
@@ -122,9 +157,9 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
     {
         if (ptr_)
         {
-            if (allowTransfer)
+            if (reuse)
             {
-                t.ptr_ = nullptr;
+                t.ptr_ = nullptr; // t.type_ already set as PTR
             }
             else
             {
@@ -153,21 +188,28 @@ inline Foam::tmp<T>::~tmp()
 template<class T>
 inline bool Foam::tmp<T>::isTmp() const
 {
-    return type_ == TMP;
+    return type_ == PTR;
 }
 
 
 template<class T>
 inline bool Foam::tmp<T>::empty() const
 {
-    return (isTmp() && !ptr_);
+    return (!ptr_ && isTmp());
 }
 
 
 template<class T>
 inline bool Foam::tmp<T>::valid() const
 {
-    return (!isTmp() || (isTmp() && ptr_));
+    return (ptr_ || type_ == CREF);
+}
+
+
+template<class T>
+inline bool Foam::tmp<T>::movable() const
+{
+    return (type_ == PTR && ptr_ && ptr_->unique());
 }
 
 
@@ -179,7 +221,7 @@ inline Foam::word Foam::tmp<T>::typeName() const
 
 
 template<class T>
-inline T* Foam::tmp<T>::ptr() const
+inline const T& Foam::tmp<T>::cref() const
 {
     if (isTmp())
     {
@@ -189,22 +231,9 @@ inline T* Foam::tmp<T>::ptr() const
                 << typeName() << " deallocated"
                 << abort(FatalError);
         }
-
-        if (!ptr_->unique())
-        {
-            FatalErrorInFunction
-                << "Attempt to acquire pointer to object referred to"
-                << " by multiple temporaries of type " << typeName()
-                << abort(FatalError);
-        }
-
-        T* ptr = ptr_;
-        ptr_ = nullptr;
-
-        return ptr;
     }
 
-    return ptr_->clone().ptr();
+    return *ptr_; // const reference
 }
 
 
@@ -223,12 +252,55 @@ inline T& Foam::tmp<T>::ref() const
     else
     {
         FatalErrorInFunction
-            << "Attempt to acquire non-const reference to const object"
-            << " from a " << typeName()
+            << "Attempted non-const reference to const object from a "
+            << typeName()
             << abort(FatalError);
     }
 
-    return *ptr_;
+    return *ptr_; // non-const reference
+}
+
+
+template<class T>
+inline T& Foam::tmp<T>::constCast() const
+{
+    if (isTmp() && !ptr_)
+    {
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
+
+    return const_cast<T&>(*ptr_);
+}
+
+
+template<class T>
+inline T* Foam::tmp<T>::ptr() const
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+        else if (!ptr_->unique())
+        {
+            FatalErrorInFunction
+                << "Attempt to acquire pointer to object referred to"
+                << " by multiple temporaries of type " << typeName()
+                << abort(FatalError);
+        }
+
+        T* ptr = ptr_;
+        ptr_ = nullptr;
+
+        return ptr;
+    }
+
+    return ptr_->clone().ptr();
 }
 
 
@@ -240,41 +312,75 @@ inline void Foam::tmp<T>::clear() const
         if (ptr_->unique())
         {
             delete ptr_;
-            ptr_ = nullptr;
         }
         else
         {
             ptr_->operator--();
-            ptr_ = nullptr;
         }
+        ptr_ = nullptr;
     }
 }
 
 
+template<class T>
+inline void Foam::tmp<T>::reset()
+{
+    clear();
+    ptr_ = nullptr;
+    type_ = PTR;
+}
+
+
+template<class T>
+inline void Foam::tmp<T>::reset(T* p)
+{
+    clear();
+    ptr_ = p;
+    type_ = PTR;
+}
+
+
+template<class T>
+inline void Foam::tmp<T>::swap(tmp<T>& other) noexcept
+{
+    // Copy/assign for pointer types
+    T* p = ptr_;
+    ptr_ = other.ptr_;
+    other.ptr_ = p;
+
+    refType t = type_;
+    type_ = other.type_;
+    other.type_ = t;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
 inline const T& Foam::tmp<T>::operator()() const
 {
-    if (isTmp())
-    {
-        if (!ptr_)
-        {
-            FatalErrorInFunction
-                << typeName() << " deallocated"
-                << abort(FatalError);
-        }
-    }
-
-    // Return const reference
-    return *ptr_;
+    return cref();
 }
 
 
 template<class T>
 inline Foam::tmp<T>::operator const T&() const
 {
-    return operator()();
+    return cref();
+}
+
+
+template<class T>
+inline const T* Foam::tmp<T>::operator->() const
+{
+    if (!ptr_ && isTmp())
+    {
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
+
+    return ptr_;
 }
 
 
@@ -301,20 +407,6 @@ inline T* Foam::tmp<T>::operator->()
 }
 
 
-template<class T>
-inline const T* Foam::tmp<T>::operator->() const
-{
-    if (isTmp() && !ptr_)
-    {
-        FatalErrorInFunction
-            << typeName() << " deallocated"
-            << abort(FatalError);
-    }
-
-    return ptr_;
-}
-
-
 template<class T>
 inline void Foam::tmp<T>::operator=(T* p)
 {
@@ -326,8 +418,7 @@ inline void Foam::tmp<T>::operator=(T* p)
             << "Attempted copy of a deallocated " << typeName()
             << abort(FatalError);
     }
-
-    if (p && !p->unique())
+    else if (!p->unique())
     {
         FatalErrorInFunction
             << "Attempted assignment of a " << typeName()
@@ -336,7 +427,7 @@ inline void Foam::tmp<T>::operator=(T* p)
     }
 
     ptr_ = p;
-    type_ = TMP;
+    type_ = PTR;
 }
 
 
@@ -347,17 +438,16 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
 
     if (t.isTmp())
     {
-        type_ = TMP;
+        ptr_ = t.ptr_;
+        type_ = PTR;
+        t.ptr_ = nullptr;
 
-        if (!t.ptr_)
+        if (!ptr_)
         {
             FatalErrorInFunction
                 << "Attempted assignment to a deallocated " << typeName()
                 << abort(FatalError);
         }
-
-        ptr_ = t.ptr_;
-        t.ptr_ = nullptr;
     }
     else
     {
diff --git a/src/OpenFOAM/memory/tmp/tmpNrc.H b/src/OpenFOAM/memory/tmp/tmpNrc.H
new file mode 100644
index 0000000000..30eabf397a
--- /dev/null
+++ b/src/OpenFOAM/memory/tmp/tmpNrc.H
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::tmpNrc
+
+Description
+    A class for managing temporary objects without reference counting.
+
+SourceFiles
+    tmpNrcI.H
+
+See also
+    Foam::autoPtr
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tmpNrc_H
+#define tmpNrc_H
+
+#include "refCount.H"
+#include "word.H"
+#include <utility>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                             Class tmpNrc Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class tmpNrc
+{
+    // Private data
+
+        //- Object types
+        enum refType
+        {
+            PTR,    //!< Managing a pointer (not ref-counted)
+            CREF    //!< Using a const-reference to an object
+        };
+
+        //- The managed pointer or the address of const-reference object
+        mutable T* ptr_;
+
+        //- The type (managed pointer | const-reference object)
+        refType type_;
+
+
+public:
+
+    // STL type definitions
+
+        //- Type of object being managed
+        typedef T element_type;
+
+        //- Pointer to type of object being managed
+        typedef T* pointer;
+
+
+    //- Null reference counter class
+    typedef Foam::refCount::zero refCount;
+
+
+    // Constructors
+
+        //- Construct with no managed pointer.
+        inline constexpr tmpNrc() noexcept;
+
+        //- Construct with no managed pointer.
+        inline constexpr tmpNrc(std::nullptr_t) noexcept;
+
+        //- Construct, taking ownership of the pointer.
+        inline explicit tmpNrc(T* p) noexcept;
+
+        //- Construct for a const reference to an object.
+        inline tmpNrc(const T& obj) noexcept;
+
+        //- Copy construct
+        inline tmpNrc(const tmpNrc<T>& t);
+
+        //- Construct copy, transferring content of temporary if required
+        inline tmpNrc(const tmpNrc<T>& t, bool reuse);
+
+
+    //- Destructor: deletes managed pointer
+    inline ~tmpNrc();
+
+
+    // Member Functions
+
+    // Query
+
+        //- True if this is a managed pointer (not a const reference)
+        inline bool isTmp() const;
+
+        //- True if this is a non-null managed pointer
+        inline bool empty() const;
+
+        //- True if this is a non-null managed pointer,
+        //- or is a const object reference
+        inline bool valid() const;
+
+        //- True if this is a non-null managed pointer with a unique ref-count
+        inline bool movable() const;
+
+        //- Return type-name of the tmp, constructed from type-name of T
+        inline word typeName() const;
+
+
+    // Access
+
+        //- Return the const object reference or a const reference to the
+        //- contents of a non-null managed pointer.
+        //  Fatal for a null managed pointer
+        inline const T& cref() const;
+
+        //- Return non-const reference to the contents of a non-null
+        //- managed pointer.
+        //  Fatal for a null managed pointer or if the object is const.
+        inline T& ref() const;
+
+        //- Non-const dereference, even if the object is const.
+        //  This is similar to ref(), but applies a const_cast to access
+        //  const objects.
+        //  Fatal for a null managed pointer.
+        inline T& constCast() const;
+
+
+    // Edit
+
+        //- Return managed pointer for reuse, or clone() the const object
+        //- reference.
+        inline T* ptr() const;
+
+        //- If object pointer points to valid object:
+        //- delete object and set pointer to nullptr
+        inline void clear() const;
+
+
+    // Member operators
+
+        //- Return const reference to the object.
+        //  Identical to cref() method.
+        inline const T& operator()() const;
+
+        //- Cast to underlying data type, using the cref() method.
+        inline operator const T&() const;
+
+        //- Dereferences (const) pointer to the managed object.
+        //  Fatal for a null managed pointer.
+        inline const T* operator->() const;
+
+        //- Dereferences (non-const) pointer to the managed object.
+        //  Fatal for a null managed pointer or if the object is const.
+        inline T* operator->();
+
+        //- Take ownership of the pointer.
+        //  Fatal for a null pointer, or when the pointer is non-unique.
+        inline void operator=(T* p);
+
+        //- Transfer ownership of the managed pointer.
+        //  Fatal for a null managed pointer or if the object is const.
+        inline void operator=(const tmpNrc<T>& t);
+};
+
+
+// Global Functions
+
+//- Specializes the Swap algorithm for tmp.
+//  Swaps the pointers and types of lhs and rhs. Calls \c lhs.swap(rhs)
+template<class T>
+void Swap(tmpNrc<T>& lhs, tmpNrc<T>& rhs)
+{
+    lhs.swap(rhs);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "tmpNrcI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H b/src/OpenFOAM/memory/tmp/tmpNrcI.H
similarity index 72%
rename from src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
rename to src/OpenFOAM/memory/tmp/tmpNrcI.H
index 7f26ab095f..85e2b3a25c 100644
--- a/src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
+++ b/src/OpenFOAM/memory/tmp/tmpNrcI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,32 +29,48 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::tmpNrc<T>::tmpNrc(T* tPtr)
+inline constexpr Foam::tmpNrc<T>::tmpNrc() noexcept
 :
-    type_(TMP),
-    ptr_(tPtr)
+    ptr_(nullptr),
+    type_(PTR)
 {}
 
 
 template<class T>
-inline Foam::tmpNrc<T>::tmpNrc(const T& tRef)
+inline constexpr Foam::tmpNrc<T>::tmpNrc(std::nullptr_t) noexcept
 :
-    type_(CONST_REF),
-    ptr_(const_cast<T*>(&tRef))
+    ptr_(nullptr),
+    type_(PTR)
+{}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(T* p) noexcept
+:
+    ptr_(p),
+    type_(PTR)
+{}
+
+
+template<class T>
+inline Foam::tmpNrc<T>::tmpNrc(const T& obj) noexcept
+:
+    ptr_(const_cast<T*>(&obj)),
+    type_(CREF)
 {}
 
 
 template<class T>
 inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t)
 :
-    type_(t.type_),
-    ptr_(t.ptr_)
+    ptr_(t.ptr_),
+    type_(t.type_)
 {
     if (isTmp())
     {
         if (ptr_)
         {
-            t.type_ = CONST_REF;
+            t.type_ = CREF;
         }
         else
         {
@@ -67,22 +83,22 @@ inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t)
 
 
 template<class T>
-inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t, bool allowTransfer)
+inline Foam::tmpNrc<T>::tmpNrc(const tmpNrc<T>& t, bool reuse)
 :
-    type_(t.type_),
-    ptr_(t.ptr_)
+    ptr_(t.ptr_),
+    type_(t.type_)
 {
     if (isTmp())
     {
         if (ptr_)
         {
-            if (allowTransfer)
+            if (reuse)
             {
-                t.ptr_ = nullptr;
+                t.ptr_ = nullptr; // t.type_ already set as PTR
             }
             else
             {
-                t.type_ = CONST_REF;
+                t.type_ = CREF;
             }
         }
         else
@@ -107,21 +123,28 @@ inline Foam::tmpNrc<T>::~tmpNrc()
 template<class T>
 inline bool Foam::tmpNrc<T>::isTmp() const
 {
-    return type_ == TMP;
+    return type_ == PTR;
 }
 
 
 template<class T>
 inline bool Foam::tmpNrc<T>::empty() const
 {
-    return (isTmp() && !ptr_);
+    return (!ptr_ && isTmp());
 }
 
 
 template<class T>
 inline bool Foam::tmpNrc<T>::valid() const
 {
-    return (!isTmp() || (isTmp() && ptr_));
+    return (ptr_ || type_ == CREF);
+}
+
+
+template<class T>
+inline bool Foam::tmpNrc<T>::movable() const
+{
+    return (type_ == PTR && ptr_);
 }
 
 
@@ -133,7 +156,24 @@ inline Foam::word Foam::tmpNrc<T>::typeName() const
 
 
 template<class T>
-inline T& Foam::tmpNrc<T>::ref()
+inline const T& Foam::tmpNrc<T>::cref() const
+{
+    if (isTmp())
+    {
+        if (!ptr_)
+        {
+            FatalErrorInFunction
+                << typeName() << " deallocated"
+                << abort(FatalError);
+        }
+    }
+
+    return *ptr_; // const reference
+}
+
+
+template<class T>
+inline T& Foam::tmpNrc<T>::ref() const
 {
     if (isTmp())
     {
@@ -147,12 +187,26 @@ inline T& Foam::tmpNrc<T>::ref()
     else
     {
         FatalErrorInFunction
-            << "Attempt to acquire non-const reference to const object"
-            << " from a " << typeName()
+            << "Attempted non-const reference to const object from a "
+            << typeName()
             << abort(FatalError);
     }
 
-    return *ptr_;
+    return *ptr_; // non-const reference
+}
+
+
+template<class T>
+inline T& Foam::tmpNrc<T>::constCast() const
+{
+    if (isTmp() && !ptr_)
+    {
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
+
+    return const_cast<T&>(*ptr_);
 }
 
 
@@ -173,10 +227,8 @@ inline T* Foam::tmpNrc<T>::ptr() const
 
         return ptr;
     }
-    else
-    {
-        return ptr_->clone().ptr();
-    }
+
+    return ptr_->clone().ptr();
 }
 
 
@@ -191,30 +243,47 @@ inline void Foam::tmpNrc<T>::clear() const
 }
 
 
+template<class T>
+inline void Foam::tmpNrc<T>::swap(tmpNrc<T>& other) noexcept
+{
+    // Copy/assign for pointer types
+    T* p = ptr_;
+    ptr_ = other.ptr_;
+    other.ptr_ = p;
+
+    refType t = type_;
+    type_ = other.type_;
+    other.type_ = t;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
 inline const T& Foam::tmpNrc<T>::operator()() const
 {
-    if (isTmp())
-    {
-        if (!ptr_)
-        {
-            FatalErrorInFunction
-                << typeName() << " deallocated"
-                << abort(FatalError);
-        }
-    }
-
-    // Return const reference
-    return *ptr_;
+    return cref();
 }
 
 
 template<class T>
 inline Foam::tmpNrc<T>::operator const T&() const
 {
-    return operator()();
+    return cref();
+}
+
+
+template<class T>
+inline const T* Foam::tmpNrc<T>::operator->() const
+{
+    if (!ptr_ && isTmp())
+    {
+        FatalErrorInFunction
+            << typeName() << " deallocated"
+            << abort(FatalError);
+    }
+
+    return ptr_;
 }
 
 
@@ -242,33 +311,19 @@ inline T* Foam::tmpNrc<T>::operator->()
 
 
 template<class T>
-inline const T* Foam::tmpNrc<T>::operator->() const
-{
-    if (isTmp() && !ptr_)
-    {
-        FatalErrorInFunction
-            << typeName() << " deallocated"
-            << abort(FatalError);
-    }
-
-    return ptr_;
-}
-
-
-template<class T>
-inline void Foam::tmpNrc<T>::operator=(T* tPtr)
+inline void Foam::tmpNrc<T>::operator=(T* p)
 {
     clear();
 
-    if (!tPtr)
+    if (!p)
     {
         FatalErrorInFunction
             << "Attempted copy of a deallocated " << typeName()
             << abort(FatalError);
     }
 
-    type_ = TMP;
-    ptr_ = tPtr;
+    ptr_ = p;
+    type_ = PTR;
 }
 
 
@@ -279,17 +334,16 @@ inline void Foam::tmpNrc<T>::operator=(const tmpNrc<T>& t)
 
     if (t.isTmp())
     {
-        type_ = TMP;
+        ptr_ = t.ptr_;
+        type_ = PTR;
+        t.ptr_ = nullptr;
 
-        if (!t.ptr_)
+        if (!ptr_)
         {
             FatalErrorInFunction
                 << "Attempted assignment to a deallocated " << typeName()
                 << abort(FatalError);
         }
-
-        ptr_ = t.ptr_;
-        t.ptr_ = nullptr;
     }
     else
     {
diff --git a/src/OpenFOAM/memory/tmpNrc/tmpNrc.H b/src/OpenFOAM/memory/tmpNrc/tmpNrc.H
deleted file mode 100644
index 6aa3f91156..0000000000
--- a/src/OpenFOAM/memory/tmpNrc/tmpNrc.H
+++ /dev/null
@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::tmpNrc
-
-Description
-    A class for managing temporary objects without reference counting.
-
-SourceFiles
-    tmpNrcI.H
-
-See also
-    Foam::autoPtr
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef tmpNrc_H
-#define tmpNrc_H
-
-#include "word.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                             Class tmpNrc Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class T>
-class tmpNrc
-{
-    // Private data
-
-        //- Object types
-        enum type
-        {
-            TMP,
-            CONST_REF
-        };
-
-        //- Type of object
-        mutable type type_;
-
-        //- Pointer to object
-        mutable T* ptr_;
-
-
-public:
-
-    // Null reference counter class
-    class refCount
-    {
-    public:
-
-        refCount()
-        {}
-    };
-
-
-    // Constructors
-
-        //- Store object pointer
-        inline explicit tmpNrc(T* tPtr = nullptr);
-
-        //- Store object const reference
-        inline tmpNrc(const T& tRef);
-
-        //- Construct copy and increment reference count
-        inline tmpNrc(const tmpNrc<T>& t);
-
-        //- Construct copy transferring content of temporary if required
-        inline tmpNrc(const tmpNrc<T>& t, bool allowTransfer);
-
-
-    //- Destructor: deletes temporary object when the reference count is 0
-    inline ~tmpNrc();
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return true if this is really a temporary object
-            inline bool isTmp() const;
-
-            //- Return true if this temporary object empty,
-            //  ie, a temporary without allocation
-            inline bool empty() const;
-
-            //- Is this temporary object valid,
-            //  ie, it is a reference or a temporary that has been allocated
-            inline bool valid() const;
-
-            //- Return the type name of the tmpNrc
-            //  constructed from the type name of T
-            inline word typeName() const;
-
-
-        // Edit
-
-            //- Return non-const reference or generate a fatal error
-            //  if the object is const.
-            inline T& ref();
-
-            //- Return tmpNrc pointer for reuse.
-            //  Returns a clone if the object is not a temporary
-            inline T* ptr() const;
-
-            //- If object pointer points to valid object:
-            //  delete object and set pointer to nullptr
-            inline void clear() const;
-
-
-    // Member operators
-
-        //- Const dereference operator
-        inline const T& operator()() const;
-
-        //- Const cast to the underlying type reference
-        inline operator const T&() const;
-
-        //- Return object pointer
-        inline T* operator->();
-
-        //- Return const object pointer
-        inline const T* operator->() const;
-
-        //- Assignment to pointer changing this tmpNrc to a temporary T
-        inline void operator=(T* tPtr);
-
-        //- Assignment transferring the temporary T to this tmpNrc
-        inline void operator=(const tmpNrc<T>& t);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "tmpNrcI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index e5aedbd501..6d46ce921d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -79,8 +79,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::value
 ) const
 {
     NotImplemented;
-
-    return tmp<Foam::Field<Type>>(nullptr);
+    return tmp<Field<Type>>();
 }
 
 
@@ -101,8 +100,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
 ) const
 {
     NotImplemented;
-
-    return tmp<Foam::Field<Type>>(nullptr);
+    return tmp<Field<Type>>();
 }
 
 
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
index da7dfa8bdf..f1c8dfd599 100644
--- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -417,15 +417,13 @@ public:
                     vf, model.muEff()/model.rho(), model.U(), delta
                 );
             }
-            else
-            {
-                FatalErrorInFunction
-                    << "Scheme requires a turbulence model to be present. "
-                    << "Unable to retrieve turbulence model from the mesh "
-                    << "database" << exit(FatalError);
 
-                return tmp<surfaceScalarField>(nullptr);
-            }
+            FatalErrorInFunction
+                << "Scheme requires a turbulence model to be present. "
+                << "Unable to retrieve turbulence model from the mesh "
+                << "database" << exit(FatalError);
+
+            return tmp<surfaceScalarField>();
         }
 
 
@@ -501,13 +499,8 @@ public:
             {
                 return (bf*tScheme2_().correction(vf));
             }
-            else
-            {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
-            }
+
+            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>();
         }
 };
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
index aa653e524c..11c366356d 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
@@ -79,7 +79,7 @@ protected:
     template<class GeoFieldType>
     void correctBoundaryConditions(const tmp<GeoFieldType>& tgf) const
     {
-        const_cast<GeoFieldType&>(tgf()).correctBoundaryConditions();
+        tgf.constCast().correctBoundaryConditions();
     }
 
 
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
index 3429ea0d06..be8e5b7e19 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
+++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H
@@ -148,7 +148,7 @@ public:
         virtual tmp<GeometricField<Type, faePatchField, edgeMesh>>
         correction(const GeometricField<Type, faPatchField, areaMesh>&) const
         {
-            return tmp<GeometricField<Type, faePatchField, edgeMesh>>(nullptr);
+            return tmp<GeometricField<Type, faePatchField, edgeMesh>>();
         }
 
         //- Return the lnGrad of the given cell field
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
index a26dbbf747..fd2e8b8ff7 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H
@@ -189,7 +189,7 @@ public:
         virtual tmp<GeometricField<Type, faePatchField, edgeMesh>>
         correction(const GeometricField<Type, faPatchField, areaMesh>&) const
         {
-            return tmp<GeometricField<Type, faePatchField, edgeMesh>>(nullptr);
+            return tmp<GeometricField<Type, faePatchField, edgeMesh>>();
         }
 
         //- Return the face-interpolate of the given cell field
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 5d896b07a9..04600de1be 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -135,14 +135,12 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
 
         return max(Co/maxCo_, scalar(1))/deltaT;
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Incorrect dimensions of phi: " << phi.dimensions()
-            << abort(FatalError);
 
-        return tmp<surfaceScalarField>(nullptr);
-    }
+    FatalErrorInFunction
+        << "Incorrect dimensions of phi: " << phi.dimensions()
+        << abort(FatalError);
+
+    return tmp<surfaceScalarField>();
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
index d263b854d7..dce9cc4759 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
@@ -56,13 +56,8 @@ Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
     {
         return neighbFvPatch().patchInternalField(iF);
     }
-    else
-    {
-        return tmp<labelField>(new labelField(iF.size(), 0));
 
-    }
-
-    return tmp<labelField>(nullptr);
+    return tmp<labelField>(new labelField(iF.size(), 0));
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
index 2aad929858..5662a8103e 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
@@ -58,12 +58,8 @@ internalFieldTransfer
     {
         return neighbFvPatch().patchInternalField(iF);
     }
-    else
-    {
-        return tmp<labelField>(new labelField(iF.size(), 0));
 
-    }
-    return tmp<labelField>(nullptr);
+    return tmp<labelField>(new labelField(iF.size(), 0));
 }
 
 // ************************************************************************* //
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
index 8a37466955..9dc7ba2ea8 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
@@ -62,14 +62,12 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::rho(const label patchi) const
             mesh_.lookupObject<volScalarField>(rhoName_);
         return rho.boundaryField()[patchi];
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Unable to set rho for patch " << patchi
-            << exit(FatalError);
-    }
 
-    return tmp<Field<scalar>>(nullptr);
+    FatalErrorInFunction
+        << "Unable to set rho for patch " << patchi
+        << exit(FatalError);
+
+    return tmp<Field<scalar>>();
 }
 
 
@@ -91,14 +89,12 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::Cp(const label patchi) const
 
         return thermo.Cp(pp, Tp, patchi);
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Unable to set Cp for patch " << patchi
-            << exit(FatalError);
-    }
 
-    return tmp<Field<scalar>>(nullptr);
+    FatalErrorInFunction
+        << "Unable to set Cp for patch " << patchi
+        << exit(FatalError);
+
+    return tmp<Field<scalar>>();
 }
 
 
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 057614e094..79eaa7d6e8 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -119,7 +119,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
         }
     }
 
-    return tmp<volScalarField>(nullptr);
+    return tmp<volScalarField>();
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
index 2c1c04c456..47ba719288 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
@@ -109,8 +109,7 @@ Foam::ParticleStressModels::Lun::dTaudTheta
 ) const
 {
     NotImplemented;
-
-    return tmp<Field<scalar>>(nullptr);
+    return tmp<Field<scalar>>();
 }
 
 
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 87bf0d84ac..35f869c586 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -47,15 +47,13 @@ Foam::DispersionRASModel<CloudType>::kModel() const
             obr.lookupObject<turbulenceModel>(turbName);
         return model.k();
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Turbulence model not found in mesh database" << nl
-            << "Database objects include: " << obr.sortedToc()
-            << abort(FatalError);
 
-        return tmp<volScalarField>(nullptr);
-    }
+    FatalErrorInFunction
+        << "Turbulence model not found in mesh database" << nl
+        << "Database objects include: " << obr.sortedToc()
+        << abort(FatalError);
+
+    return tmp<volScalarField>();
 }
 
 
@@ -77,15 +75,13 @@ Foam::DispersionRASModel<CloudType>::epsilonModel() const
             obr.lookupObject<turbulenceModel>(turbName);
         return model.epsilon();
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Turbulence model not found in mesh database" << nl
-            << "Database objects include: " << obr.sortedToc()
-            << abort(FatalError);
 
-        return tmp<volScalarField>(nullptr);
-    }
+    FatalErrorInFunction
+        << "Turbulence model not found in mesh database" << nl
+        << "Database objects include: " << obr.sortedToc()
+        << abort(FatalError);
+
+    return tmp<volScalarField>();
 }
 
 
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index a771a0837d..4b0be43e65 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -70,15 +70,13 @@ Foam::BrownianMotionForce<CloudType>::kModel() const
             obr.lookupObject<turbulenceModel>(turbName);
         return model.k();
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Turbulence model not found in mesh database" << nl
-            << "Database objects include: " << obr.sortedToc()
-            << abort(FatalError);
 
-        return tmp<volScalarField>(nullptr);
-    }
+    FatalErrorInFunction
+        << "Turbulence model not found in mesh database" << nl
+        << "Database objects include: " << obr.sortedToc()
+        << abort(FatalError);
+
+    return tmp<volScalarField>();
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index 179836560a..cbc6124624 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -70,7 +70,7 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::transform
 ) const
 {
     NotImplemented;
-    return tmp<vectorField>(nullptr);
+    return tmp<vectorField>();
 }
 
 
@@ -80,7 +80,7 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::invTransform
 ) const
 {
     NotImplemented;
-    return tmp<vectorField>(nullptr);
+    return tmp<vectorField>();
 }
 
 
@@ -97,7 +97,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
 ) const
 {
      NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
@@ -117,7 +117,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
 ) const
 {
     NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index e6a50a25d6..fcaa3ed099 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -71,7 +71,7 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::transform
 ) const
 {
     NotImplemented;
-    return tmp<vectorField>(nullptr);
+    return tmp<vectorField>();
 }
 
 
@@ -81,7 +81,7 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::invTransform
 ) const
 {
     NotImplemented;
-    return tmp<vectorField>(nullptr);
+    return tmp<vectorField>();
 }
 
 
@@ -98,7 +98,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
 ) const
 {
      NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
@@ -118,7 +118,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
 ) const
 {
     NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
index b22c509c4d..162bab5cb8 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
@@ -245,7 +245,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
 ) const
 {
     NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
@@ -265,7 +265,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
 ) const
 {
     NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index 8082337550..8f3ea1ad50 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -137,7 +137,7 @@ Foam::tmp<Foam::scalarField> Foam::sampledSurface::sample
 ) const
 {
     NotImplemented;
-    return tmp<scalarField>(nullptr);
+    return tmp<scalarField>();
 }
 
 
@@ -147,7 +147,7 @@ Foam::tmp<Foam::vectorField> Foam::sampledSurface::sample
 ) const
 {
     NotImplemented;
-    return tmp<vectorField>(nullptr);
+    return tmp<vectorField>();
 }
 
 
@@ -157,7 +157,7 @@ Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample
 ) const
 {
     NotImplemented;
-    return tmp<sphericalTensorField>(nullptr);
+    return tmp<sphericalTensorField>();
 }
 
 
@@ -167,7 +167,7 @@ Foam::tmp<Foam::symmTensorField> Foam::sampledSurface::sample
 ) const
 {
     NotImplemented;
-    return tmp<symmTensorField>(nullptr);
+    return tmp<symmTensorField>();
 }
 
 
@@ -177,7 +177,7 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
 ) const
 {
     NotImplemented;
-    return tmp<tensorField>(nullptr);
+    return tmp<tensorField>();
 }
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
index dd7ee27b91..fa9f6d8b9f 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
@@ -66,7 +66,7 @@ void Foam::radiation::noSoot::correct()
 const Foam::volScalarField& Foam::radiation::noSoot::soot() const
 {
     NotImplemented;
-    return tmp<volScalarField>(nullptr);
+    return tmp<volScalarField>();
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
index 1e0d946903..2c8429ab0b 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
@@ -69,7 +69,7 @@ Foam::basicSolidChemistryModel::RR(const label i)
 
     return dynamic_cast<volScalarField::Internal&>
     (
-        const_cast<volScalarField::Internal& >
+        const_cast<volScalarField::Internal&>
         (
             volScalarField::Internal::null()
         )
@@ -88,7 +88,7 @@ Foam::basicSolidChemistryModel::calculateRR
 
     return dynamic_cast<tmp<volScalarField::Internal>&>
     (
-        const_cast<volScalarField::Internal& >
+        const_cast<volScalarField::Internal&>
         (
             volScalarField::Internal::null()
         )
diff --git a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 4e57fcba84..5017506fba 100644
--- a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -106,11 +106,11 @@ void Foam::waveAlphaFvPatchScalarField::updateCoeffs()
         )
     );
 
-    waveModel& model = const_cast<waveModel&>(tmodel());
+    waveModel& model = tmodel.constCast();
 
     model.correct(db().time().value());
 
-    operator == (model.alpha());
+    operator==(model.alpha());
 
     fixedValueFvPatchField<scalar>::updateCoeffs();
 }
diff --git a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index 83fa6c64ea..9755b2bd8c 100644
--- a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -106,11 +106,11 @@ void Foam::waveVelocityFvPatchVectorField::updateCoeffs()
         )
     );
 
-    waveModel& model = const_cast<waveModel&>(tmodel());
+    waveModel& model = tmodel.constCast();
 
     model.correct(db().time().value());
 
-    operator == (model.U());
+    operator==(model.U());
 
     fixedValueFvPatchField<vector>::updateCoeffs();
 }

From 57291e86925c392753ffc670de68e4e330fd4a2c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 26 Feb 2018 14:00:30 +0100
Subject: [PATCH 11/13] STYLE: use autoPtr::New and tmp::New for simple return
 types

---
 .../phaseModel/phaseModel.H                   |   2 +-
 applications/test/PtrList/Test-PtrList.C      |   2 +-
 .../smoothAlignmentSolver.C                   |  22 ++-
 .../manipulation/renumberMesh/renumberMesh.C  |  61 ++++-----
 .../reconstructParMesh/reconstructParMesh.C   |  36 +++--
 .../steadyParticleTracksTemplates.C           |   2 +-
 .../lumpedPointForces/lumpedPointForces.C     |  25 ++--
 .../applyBoundaryLayer/applyBoundaryLayer.C   |   4 +-
 .../preProcessing/setFields/setFields.C       |   8 +-
 .../surfaceBooleanFeatures.C                  |  41 +++---
 .../extractionMethod/extractFromFile.C        |  15 +--
 .../extractionMethod/extractFromNone.C        |   2 +-
 .../extractionMethod/extractFromSurface.C     |  15 +--
 .../dynamicIndexedOctree.H                    |   5 +-
 .../algorithms/indexedOctree/indexedOctree.H  |   5 +-
 .../Lists/CompactListList/CompactListListI.H  |   5 +-
 .../containers/Lists/FixedList/FixedListI.H   |   2 +-
 src/OpenFOAM/containers/Lists/List/ListI.H    |   2 +-
 .../Lists/PackedList/PackedBoolListI.H        |   2 +-
 .../containers/Lists/PackedList/PackedListI.H |   2 +-
 src/OpenFOAM/db/IOobject/IOobject.H           |   4 +-
 src/OpenFOAM/db/dictionary/dictionary.C       |   2 +-
 src/OpenFOAM/db/dictionary/dictionaryIO.C     |   2 +-
 src/OpenFOAM/dimensionSet/dimensionSet.H      |   2 +-
 .../FieldFields/FieldField/FieldField.C       |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      |   2 +-
 src/OpenFOAM/fields/Fields/Field/Field.H      |   2 +-
 .../fields/Fields/Field/FieldMapper.H         |   2 +-
 .../pointPatchField/pointPatchField.C         |   2 +-
 src/OpenFOAM/graph/curve/curve.H              |   2 +-
 .../LUscalarMatrix/procLduInterface.H         |   2 +-
 .../LduMatrix/LduMatrixPreconditioner.C       |  21 ++-
 .../LduMatrix/LduMatrix/LduMatrixSmoother.C   |  15 +--
 .../LduMatrix/LduMatrix/LduMatrixSolver.C     |  17 +--
 src/OpenFOAM/matrices/Matrix/MatrixI.H        |   2 +-
 .../RectangularMatrix/RectangularMatrixI.H    |   5 +-
 .../matrices/SquareMatrix/SquareMatrixI.H     |   2 +-
 .../SymmetricSquareMatrixI.H                  |   5 +-
 .../lduMatrix/lduMatrixPreconditioner.C       |  18 ++-
 .../lduMatrix/lduMatrix/lduMatrixSmoother.C   |  14 +-
 .../lduMatrix/lduMatrix/lduMatrixSolver.C     |  14 +-
 .../meshes/meshShapes/cellModel/cellModel.H   |   4 +-
 .../meshes/meshShapes/cellShape/cellShapeI.H  |   2 +-
 .../mapPolyMesh/mapDistribute/mapDistribute.C |   2 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |   2 +-
 .../polyPatches/polyPatch/polyPatch.H         |  13 +-
 .../meshes/polyMesh/zones/cellZone/cellZone.H |  10 +-
 .../meshes/polyMesh/zones/faceZone/faceZone.H |  10 +-
 .../polyMesh/zones/pointZone/pointZone.H      |  10 +-
 .../functions/Function1/Constant/Constant.C   |   2 +-
 .../functions/Function1/One/OneConstant.C     |   2 +-
 .../functions/Function1/makeFunction1s.C      |   2 +-
 .../nutLowReWallFunctionFvPatchScalarField.C  |   2 +-
 src/conversion/ccm/reader/ccmReaderSolution.C |   4 +-
 src/dynamicMesh/boundaryPatch/boundaryPatch.C |   2 +-
 .../polyTopoChange/polyTopoChange.C           | 126 +++++++++---------
 src/engine/ignition/ignitionSite.H            |   4 +-
 .../faMesh/faPatches/faPatch/faPatch.C        |   2 +-
 .../faMesh/faPatches/faPatch/faPatch.H        |   7 +-
 .../basicSymmetryFaPatchScalarField.C         |   2 +-
 .../fixedGradient/fixedGradientFaPatchField.C |   7 +-
 .../transform/transformFaPatchScalarField.C   |   2 +-
 .../constraint/empty/emptyFaPatchField.H      |   8 +-
 .../wedge/wedgeFaPatchScalarField.C           |   2 +-
 .../basicSymmetryFvPatchScalarField.C         |   2 +-
 .../fixedGradient/fixedGradientFvPatchField.C |   7 +-
 .../transform/transformFvPatchScalarField.C   |   4 +-
 .../constraint/empty/emptyFvPatchField.H      |   8 +-
 .../symmetryPlaneFvPatchScalarField.C         |   2 +-
 .../wedge/wedgeFvPatchScalarField.C           |   2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H |   4 +-
 .../fvsPatchField/fvsPatchField.H             |   7 +-
 .../globalIndexStencils/cellToCellStencil.C   |  15 +--
 .../globalIndexStencils/cellToFaceStencil.C   |  15 +--
 .../regionCoupled/regionCoupledFvPatch.C      |   2 +-
 .../regionCoupled/regionCoupledWallFvPatch.C  |   3 +-
 .../surfaceFieldValueTemplates.C              |   2 +-
 .../volFieldValue/volFieldValueTemplates.C    |   4 +-
 .../ReynoldsAnalogy/ReynoldsAnalogy.C         |   4 +-
 .../field/streamLine/streamLineBase.C         |  15 +--
 .../MGridGenGAMGAgglomerate.C                 |   2 +-
 .../motionInterpolation/motionInterpolation.C |   2 +-
 .../derived/rotorDiskSource/rotorDiskSource.C |   7 +-
 src/lagrangian/basic/particle/particle.H      |   4 +-
 .../KinematicCloud/KinematicCloudI.H          |   2 +-
 .../Templates/ReactingCloud/ReactingCloudI.H  |   4 +-
 .../Templates/ThermoCloud/ThermoCloudI.H      |   2 +-
 .../molecule/molecule/molecule.H              |   2 +-
 src/lumpedPointMotion/lumpedPointIOMovement.C |  23 ++--
 src/lumpedPointMotion/lumpedPointTools.C      |  25 ++--
 .../blockVertices/blockVertex/blockVertex.C   |  14 +-
 src/mesh/blockMesh/blocks/block/block.C       |  23 +---
 .../displacementMeshMoverMotionSolver.C       |   2 +-
 .../externalDisplacementMeshMover.C           |   9 +-
 .../meshRefinement/meshRefinement.C           |   9 +-
 .../refinementSurfaces/surfaceZonesInfo.H     |   2 +-
 .../trackedParticle/trackedParticle.H         |   7 +-
 .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.H |   2 +-
 .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.H   |   2 +-
 .../EulerCoordinateRotation.H                 |  10 +-
 .../STARCDCoordinateRotation.H                |  10 +-
 .../coordinateRotation/axesRotation.H         |   5 +-
 .../coordinateRotation/cylindrical.H          |   5 +-
 .../coordinateSystems/coordinateSystem.H      |   2 +-
 .../coordinateSystems/coordinateSystemNew.C   |   4 +-
 .../edgeMeshFormats/edgeMesh/edgeMeshFormat.H |   8 +-
 .../extendedFeatureEdgeMeshFormat.H           |  10 +-
 .../edgeMeshFormats/nas/NASedgeFormat.H       |   5 +-
 .../edgeMeshFormats/obj/OBJedgeFormat.H       |   5 +-
 .../edgeMeshFormats/starcd/STARCDedgeFormat.H |   8 +-
 .../edgeMeshFormats/vtk/VTKedgeFormat.H       |   8 +-
 src/meshTools/regionSplit/regionSplit.C       |   2 +-
 .../searchablePlate/searchablePlate.C         |   2 +-
 .../pointToPointPlanarInterpolation.C         |  17 +--
 .../oversetPolyPatch/oversetGAMGInterface.C   |   2 +-
 .../regionModelFunctionObject.H               |   5 +-
 .../bodies/rigidBody/rigidBody.C              |   4 +-
 .../bodies/subBody/subBodyI.H                 |   2 +-
 .../sampledIsoSurfaceCellTemplates.C          |   2 +-
 .../isoSurface/sampledIsoSurfaceTemplates.C   |   2 +-
 .../sampledCuttingPlaneTemplates.C            |   2 +-
 .../sampledPlane/sampledPlaneTemplates.C      |   2 +-
 .../sampledThresholdCellFacesTemplates.C      |   2 +-
 .../cuttingPlane/cuttingPlaneTemplates.C      |   2 +-
 .../CrankNicolson/CrankNicolson.H             |   5 +-
 .../sixDoFSolvers/Newmark/Newmark.H           |   5 +-
 .../sixDoFSolvers/symplectic/symplectic.H     |   5 +-
 src/surfMesh/surfZone/surfZone/surfZone.H     |   2 +-
 .../TDACChemistryModel/TDACChemistryModelI.H  |   8 +-
 .../boundaryRadiationProperties.C             |  64 ++++-----
 .../const/constAnIsoSolidTransportI.H         |   5 +-
 .../transport/const/constIsoSolidTransportI.H |   5 +-
 .../exponential/exponentialSolidTransportI.H  |   5 +-
 .../polynomial/polynomialSolidTransportI.H    |  10 +-
 .../equationOfState/Boussinesq/BoussinesqI.H  |  10 +-
 .../PengRobinsonGas/PengRobinsonGasI.H        |  10 +-
 .../adiabaticPerfectFluidI.H                  |  10 +-
 .../icoPolynomial/icoPolynomialI.H            |  10 +-
 .../incompressiblePerfectGasI.H               |  10 +-
 .../specie/equationOfState/linear/linearI.H   |   4 +-
 .../perfectFluid/perfectFluidI.H              |   4 +-
 .../equationOfState/perfectGas/perfectGasI.H  |   4 +-
 .../equationOfState/rhoConst/rhoConstI.H      |   2 +-
 .../reaction/Reactions/Reaction/Reaction.H    |  13 +-
 .../specie/thermo/eConst/eConstThermoI.H      |  10 +-
 .../specie/thermo/hConst/hConstThermoI.H      |  10 +-
 .../specie/thermo/hPower/hPowerThermoI.H      |  10 +-
 .../thermo/hRefConst/hRefConstThermoI.H       |  10 +-
 .../specie/transport/const/constTransportI.H  |  10 +-
 .../logPolynomial/logPolynomialTransportI.H   |  10 +-
 .../polynomial/polynomialTransportI.H         |  10 +-
 .../sutherland/sutherlandTransportI.H         |  10 +-
 .../liquidProperties/Ar/Ar.H                  |   2 +-
 .../liquidProperties/C10H22/C10H22.H          |   2 +-
 .../liquidProperties/C12H26/C12H26.H          |   2 +-
 .../liquidProperties/C13H28/C13H28.H          |   2 +-
 .../liquidProperties/C14H30/C14H30.H          |   2 +-
 .../liquidProperties/C16H34/C16H34.H          |   2 +-
 .../liquidProperties/C2H5OH/C2H5OH.H          |   2 +-
 .../liquidProperties/C2H6/C2H6.H              |   2 +-
 .../liquidProperties/C2H6O/C2H6O.H            |   2 +-
 .../liquidProperties/C3H6O/C3H6O.H            |   2 +-
 .../liquidProperties/C3H8/C3H8.H              |   2 +-
 .../liquidProperties/C4H10O/C4H10O.H          |   2 +-
 .../liquidProperties/C6H14/C6H14.H            |   2 +-
 .../liquidProperties/C6H6/C6H6.H              |   2 +-
 .../liquidProperties/C7H16/C7H16.H            |   2 +-
 .../liquidProperties/C7H8/C7H8.H              |   2 +-
 .../liquidProperties/C8H10/C8H10.H            |   2 +-
 .../liquidProperties/C8H18/C8H18.H            |   2 +-
 .../liquidProperties/C9H20/C9H20.H            |   2 +-
 .../liquidProperties/CH3OH/CH3OH.H            |   2 +-
 .../liquidProperties/CH4N2O/CH4N2O.H          |   2 +-
 .../liquidProperties/H2O/H2O.H                |   2 +-
 .../liquidProperties/IC8H18/IC8H18.H          |   2 +-
 .../liquidProperties/IDEA/IDEA.H              |   2 +-
 .../liquidProperties/MB/MB.H                  |   2 +-
 .../liquidProperties/N2/N2.H                  |   2 +-
 .../liquidProperties/aC10H7CH3/aC10H7CH3.H    |   2 +-
 .../liquidProperties/bC10H7CH3/bC10H7CH3.H    |   2 +-
 .../liquidProperties/iC3H8O/iC3H8O.H          |   2 +-
 .../liquidMixtureProperties.C                 |   5 +-
 .../liquidMixtureProperties.H                 |   8 +-
 .../liquidProperties/liquidProperties.C       |  26 ++--
 .../liquidProperties/nC3H8O/nC3H8O.H          |   2 +-
 .../solidProperties/C/C.H                     |   2 +-
 .../solidProperties/CaCO3/CaCO3.H             |   2 +-
 .../solidProperties/ash/ash.H                 |   2 +-
 .../solidMixtureProperties.C                  |   5 +-
 .../solidMixtureProperties.H                  |   8 +-
 .../solidProperties/solidProperties.H         |   2 +-
 .../solidProperties/solidPropertiesNew.C      |  38 +++---
 .../surfaceTensionModelNew.C                  |  12 +-
 ...stantAlphaContactAngleFvPatchScalarField.C |   2 +-
 ...namicAlphaContactAngleFvPatchScalarField.C |   2 +-
 ...ryingAlphaContactAngleFvPatchScalarField.C |   2 +-
 196 files changed, 555 insertions(+), 879 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
index 44310e4df3..253b7fb07a 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
@@ -100,7 +100,7 @@ public:
 
             autoPtr<phaseModel> operator()(Istream& is) const
             {
-                return autoPtr<phaseModel>(new phaseModel(is, p_, T_));
+                return autoPtr<phaseModel>::New(is, p_, T_);
             }
         };
 
diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index 043cfe5c37..2c21975835 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -60,7 +60,7 @@ public:
 
     autoPtr<Scalar> clone() const
     {
-        return autoPtr<Scalar>(new Scalar(data_));
+        return autoPtr<Scalar>::New(data_);
     }
 
     friend Ostream& operator<<(Ostream& os, const Scalar& val)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index 33abcb622c..676ef0ab61 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
@@ -93,14 +93,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
     indices.transfer(dynIndices);
 
     List<Map<label>> compactMap;
-    return autoPtr<mapDistribute>
+    return autoPtr<mapDistribute>::New
     (
-        new mapDistribute
-        (
-            globalIndexing,
-            indices,
-            compactMap
-        )
+        globalIndexing,
+        indices,
+        compactMap
     );
 }
 
@@ -157,14 +154,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::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/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 6ddc7cda15..5f176118c4 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -518,39 +518,36 @@ autoPtr<mapPolyMesh> reorderMesh
     }
 
 
-    return autoPtr<mapPolyMesh>
+    return autoPtr<mapPolyMesh>::New
     (
-        new mapPolyMesh
-        (
-            mesh,                       // const polyMesh& mesh,
-            mesh.nPoints(),             // nOldPoints,
-            mesh.nFaces(),              // nOldFaces,
-            mesh.nCells(),              // nOldCells,
-            identity(mesh.nPoints()),   // pointMap,
-            List<objectMap>(0),         // pointsFromPoints,
-            faceOrder,                  // faceMap,
-            List<objectMap>(0),         // facesFromPoints,
-            List<objectMap>(0),         // facesFromEdges,
-            List<objectMap>(0),         // facesFromFaces,
-            cellOrder,                  // cellMap,
-            List<objectMap>(0),         // cellsFromPoints,
-            List<objectMap>(0),         // cellsFromEdges,
-            List<objectMap>(0),         // cellsFromFaces,
-            List<objectMap>(0),         // cellsFromCells,
-            identity(mesh.nPoints()),   // reversePointMap,
-            reverseFaceOrder,           // reverseFaceMap,
-            reverseCellOrder,           // reverseCellMap,
-            flipFaceFlux,               // flipFaceFlux,
-            patchPointMap,              // patchPointMap,
-            labelListList(0),           // pointZoneMap,
-            labelListList(0),           // faceZonePointMap,
-            labelListList(0),           // faceZoneFaceMap,
-            labelListList(0),           // cellZoneMap,
-            pointField(0),              // preMotionPoints,
-            patchStarts,                // oldPatchStarts,
-            oldPatchNMeshPoints,        // oldPatchNMeshPoints
-            autoPtr<scalarField>()      // oldCellVolumes
-        )
+        mesh,                       // const polyMesh& mesh,
+        mesh.nPoints(),             // nOldPoints,
+        mesh.nFaces(),              // nOldFaces,
+        mesh.nCells(),              // nOldCells,
+        identity(mesh.nPoints()),   // pointMap,
+        List<objectMap>(),          // pointsFromPoints,
+        faceOrder,                  // faceMap,
+        List<objectMap>(),          // facesFromPoints,
+        List<objectMap>(),          // facesFromEdges,
+        List<objectMap>(),          // facesFromFaces,
+        cellOrder,                  // cellMap,
+        List<objectMap>(),          // cellsFromPoints,
+        List<objectMap>(),          // cellsFromEdges,
+        List<objectMap>(),          // cellsFromFaces,
+        List<objectMap>(),          // cellsFromCells,
+        identity(mesh.nPoints()),   // reversePointMap,
+        reverseFaceOrder,           // reverseFaceMap,
+        reverseCellOrder,           // reverseCellMap,
+        flipFaceFlux,               // flipFaceFlux,
+        patchPointMap,              // patchPointMap,
+        labelListList(),            // pointZoneMap,
+        labelListList(),            // faceZonePointMap,
+        labelListList(),            // faceZoneFaceMap,
+        labelListList(),            // cellZoneMap,
+        pointField(),               // preMotionPoints,
+        patchStarts,                // oldPatchStarts,
+        oldPatchNMeshPoints,        // oldPatchNMeshPoints
+        autoPtr<scalarField>()      // oldCellVolumes
     );
 }
 
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 1842fd2490..905d61f2d7 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -98,15 +98,12 @@ autoPtr<faceCoupleInfo> determineCoupledFaces
 {
     if (fullMatch || masterMesh.nCells() == 0)
     {
-        return autoPtr<faceCoupleInfo>
+        return autoPtr<faceCoupleInfo>::New
         (
-            new faceCoupleInfo
-            (
-                masterMesh,
-                meshToAdd,
-                mergeDist,      // Absolute merging distance
-                true            // Matching faces identical
-            )
+            masterMesh,
+            meshToAdd,
+            mergeDist,      // Absolute merging distance
+            true            // Matching faces identical
         );
     }
     else
@@ -215,20 +212,17 @@ autoPtr<faceCoupleInfo> determineCoupledFaces
         }
         addFaces.shrink();
 
-        return autoPtr<faceCoupleInfo>
+        return autoPtr<faceCoupleInfo>::New
         (
-            new faceCoupleInfo
-            (
-                masterMesh,
-                masterFaces,
-                meshToAdd,
-                addFaces,
-                mergeDist,      // Absolute merging distance
-                true,           // Matching faces identical?
-                false,          // If perfect match are faces already ordered
-                                // (e.g. processor patches)
-                false           // are faces each on separate patch?
-            )
+            masterMesh,
+            masterFaces,
+            meshToAdd,
+            addFaces,
+            mergeDist,      // Absolute merging distance
+            true,           // Matching faces identical?
+            false,          // If perfect match are faces already ordered
+                            // (e.g. processor patches)
+            false           // are faces each on separate patch?
         );
     }
 }
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index f54b9b04a4..18e10d75be 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 Field<Type>(newField.xfer()));
+        return tmp<Field<Type>>::New(newField.xfer());
     }
 
     FatalErrorInFunction
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
index 95f2e85d22..c45dce76ae 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
@@ -55,22 +55,19 @@ autoPtr<GeoFieldType> loadField
         Info<< "Reading " << GeoFieldType::typeName
             << ' ' << io->name() << endl;
 
-        return autoPtr<GeoFieldType>
+        return autoPtr<GeoFieldType>::New
         (
-            new GeoFieldType
+            IOobject
             (
-                IOobject
-                (
-                    io->name(),
-                    io->instance(),
-                    io->local(),
-                    io->db(),
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE,
-                    io->registerObject()
-                ),
-                mesh
-            )
+                io->name(),
+                io->instance(),
+                io->local(),
+                io->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                io->registerObject()
+            ),
+            mesh
         );
     }
 
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 4355608576..4f63381fbe 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -244,7 +244,7 @@ tmp<volScalarField> calcNut
         // Correct nut
         turbulence->validate();
 
-        return tmp<volScalarField>(new volScalarField(turbulence->nut()));
+        return tmp<volScalarField>::New(turbulence->nut());
     }
     else
     {
@@ -264,7 +264,7 @@ tmp<volScalarField> calcNut
         // Correct nut
         turbulence->validate();
 
-        return tmp<volScalarField>(new volScalarField(turbulence->nut()));
+        return tmp<volScalarField>::New(turbulence->nut());
     }
 }
 
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 0510d50bb9..f7578ee9de 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -141,7 +141,7 @@ public:
 
     autoPtr<setCellField> clone() const
     {
-        return autoPtr<setCellField>(new setCellField());
+        return autoPtr<setCellField>::New();
     }
 
     class iNew
@@ -182,7 +182,7 @@ public:
                     << endl;
             }
 
-            return autoPtr<setCellField>(new setCellField());
+            return autoPtr<setCellField>::New();
         }
     };
 };
@@ -332,7 +332,7 @@ public:
 
     autoPtr<setFaceField> clone() const
     {
-        return autoPtr<setFaceField>(new setFaceField());
+        return autoPtr<setFaceField>::New();
     }
 
     class iNew
@@ -373,7 +373,7 @@ public:
                     << endl;
             }
 
-            return autoPtr<setFaceField>(new setFaceField());
+            return autoPtr<setFaceField>::New();
         }
     };
 };
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 939895cb0f..4449929a20 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1480,33 +1480,30 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
 
     //calcFeaturePoints(inter.cutPoints(), inter.cutEdges());
 
-    return autoPtr<extendedFeatureEdgeMesh>
+    return autoPtr<extendedFeatureEdgeMesh>::New
     (
-        new extendedFeatureEdgeMesh
-        (
-            io,
-            inter.cutPoints(),
-            inter.cutEdges(),
+        io,
+        inter.cutPoints(),
+        inter.cutEdges(),
 
-            0,                  // concaveStart,
-            0,                  // mixedStart,
-            0,                  // nonFeatureStart,
+        0,                  // concaveStart,
+        0,                  // mixedStart,
+        0,                  // nonFeatureStart,
 
-            internalStart,      // internalStart,
-            nIntOrExt,           // flatStart,
-            nIntOrExt + nFlat,   // openStart,
-            nIntOrExt + nFlat + nOpen,   // multipleStart,
+        internalStart,      // internalStart,
+        nIntOrExt,          // flatStart,
+        nIntOrExt + nFlat,  // openStart,
+        nIntOrExt + nFlat + nOpen,   // multipleStart,
 
-            normalsTmp,
-            normalVolumeTypesTmp,
-            edgeDirections,
-            normalDirectionsTmp,
-            edgeNormalsTmp,
+        normalsTmp,
+        normalVolumeTypesTmp,
+        edgeDirections,
+        normalDirectionsTmp,
+        edgeNormalsTmp,
 
-            labelListList(0),   // featurePointNormals,
-            labelListList(0),   // featurePointEdges,
-            labelList(0)        // regionEdges
-        )
+        labelListList(),    // featurePointNormals,
+        labelListList(),    // featurePointEdges,
+        labelList()         // regionEdges
     );
 }
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
index 5dd577420f..7cb51d0ccf 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
@@ -86,16 +86,13 @@ Foam::surfaceFeaturesExtraction::extractFromFile::features
         << "Selecting edges based purely on geometric tests: "
         << geometricTestOnly().c_str() << endl;
 
-    return autoPtr<surfaceFeatures>
+    return autoPtr<surfaceFeatures>::New
     (
-        new surfaceFeatures
-        (
-            surf,
-            eMesh.points(),
-            eMesh.edges(),
-            1e-6,  // mergeTol
-            geometricTestOnly()
-        )
+        surf,
+        eMesh.points(),
+        eMesh.edges(),
+        1e-6,  // mergeTol
+        geometricTestOnly()
     );
 }
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
index 45061472c4..032f676306 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
@@ -73,7 +73,7 @@ Foam::surfaceFeaturesExtraction::extractFromNone::features
     const triSurface& surf
 ) const
 {
-    return autoPtr<surfaceFeatures>(new surfaceFeatures(surf));
+    return autoPtr<surfaceFeatures>::New(surf);
 }
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
index f5a0354b62..6635a95a3e 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
@@ -80,16 +80,13 @@ Foam::surfaceFeaturesExtraction::extractFromSurface::features
         << "Selecting edges based purely on geometric tests: "
         << geometricTestOnly().c_str() << endl;
 
-    return autoPtr<surfaceFeatures>
+    return autoPtr<surfaceFeatures>::New
     (
-        new surfaceFeatures
-        (
-            surf,
-            includedAngle(),
-            0,  // minLen
-            0,  // minElems
-            geometricTestOnly()
-        )
+        surf,
+        includedAngle(),
+        0,  // minLen
+        0,  // minElems
+        geometricTestOnly()
     );
 }
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index c76391fe06..3b4705320e 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -418,10 +418,7 @@ public:
         //- Clone
         autoPtr<dynamicIndexedOctree<Type>> clone() const
         {
-            return autoPtr<dynamicIndexedOctree<Type>>
-            (
-                new dynamicIndexedOctree<Type>(*this)
-            );
+            return autoPtr<dynamicIndexedOctree<Type>>::New(*this);
         }
 
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index 1d4c7d844f..762c0a4548 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -432,10 +432,7 @@ public:
         //- Clone
         autoPtr<indexedOctree<Type>> clone() const
         {
-            return autoPtr<indexedOctree<Type>>
-            (
-                new indexedOctree<Type>(*this)
-            );
+            return autoPtr<indexedOctree<Type>>::New(*this);
         }
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 65ae222f6e..3f3cc4b622 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -101,10 +101,7 @@ template<class T, class Container>
 inline Foam::autoPtr<Foam::CompactListList<T, Container>>
 Foam::CompactListList<T, Container>::clone() const
 {
-    return autoPtr<CompactListList<T, Container>>
-    (
-        new CompactListList<T, Container>(*this)
-    );
+    return autoPtr<CompactListList<T, Container>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 385765aade..db4d46fffc 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -135,7 +135,7 @@ template<class T, unsigned Size>
 inline Foam::autoPtr<Foam::FixedList<T, Size>>
 Foam::FixedList<T, Size>::clone() const
 {
-    return autoPtr<FixedList<T, Size>>(new FixedList<T, Size>(*this));
+    return autoPtr<FixedList<T, Size>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 742500554d..46e24e1d73 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -95,7 +95,7 @@ inline constexpr Foam::List<T>::List() noexcept
 template<class T>
 inline Foam::autoPtr<Foam::List<T>> Foam::List<T>::clone() const
 {
-    return autoPtr<List<T>>(new List<T>(*this));
+    return autoPtr<List<T>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index bd596dbf2b..c1d4e7156f 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -125,7 +125,7 @@ inline Foam::PackedBoolList::PackedBoolList
 inline Foam::autoPtr<Foam::PackedBoolList>
 Foam::PackedBoolList::clone() const
 {
-    return autoPtr<PackedBoolList>(new PackedBoolList(*this));
+    return autoPtr<PackedBoolList>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 9696290f92..9a3e0a8a41 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -267,7 +267,7 @@ template<unsigned nBits>
 inline Foam::autoPtr<Foam::PackedList<nBits>>
 Foam::PackedList<nBits>::clone() const
 {
-    return autoPtr<PackedList<nBits>>(new PackedList<nBits>(*this));
+    return autoPtr<PackedList<nBits>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index c520fbd890..e25d715b9b 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -279,13 +279,13 @@ public:
         //- Clone
         autoPtr<IOobject> clone() const
         {
-            return autoPtr<IOobject>(new IOobject(*this));
+            return autoPtr<IOobject>::New(*this);
         }
 
         //- Clone resetting registry
         autoPtr<IOobject> clone(const objectRegistry& registry) const
         {
-            return autoPtr<IOobject>(new IOobject(*this, registry));
+            return autoPtr<IOobject>::New(*this, registry);
         }
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index d015a46467..a5a926df25 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -150,7 +150,7 @@ Foam::dictionary::dictionary
 
 Foam::autoPtr<Foam::dictionary> Foam::dictionary::clone() const
 {
-    return autoPtr<dictionary>(new dictionary(*this));
+    return autoPtr<dictionary>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index d608b74e68..2453f3760b 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -71,7 +71,7 @@ Foam::dictionary::dictionary(Istream& is, bool keepHeader)
 
 Foam::autoPtr<Foam::dictionary> Foam::dictionary::New(Istream& is)
 {
-    return autoPtr<dictionary>(new dictionary(is));
+    return autoPtr<dictionary>::New(is);
 }
 
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index ca18178fee..fa07827382 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -250,7 +250,7 @@ public:
         //- Construct and return a clone
         autoPtr<dimensionSet> clone() const
         {
-            return autoPtr<dimensionSet>(new dimensionSet(*this));
+            return autoPtr<dimensionSet>::New(*this);
         }
 
         //- Construct from Istream
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 48610c8f97..17a9ce9170 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -177,7 +177,7 @@ FieldField<Field, Type>::FieldField(Istream& is)
 template<template<class> class Field, class Type>
 tmp<FieldField<Field, Type>> FieldField<Field, Type>::clone() const
 {
-    return tmp<FieldField<Field, Type>>(new FieldField<Field, Type>(*this));
+    return tmp<FieldField<Field, Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 321fdb1029..1cb7cacf83 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -348,7 +348,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::clone() const
 {
-    return tmp<Field<Type>>(new Field<Type>(*this));
+    return tmp<Field<Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 6fcab57ea0..1af0dbdc59 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -241,7 +241,7 @@ public:
         template<class Type2>
         static tmp<Field<Type>> NewCalculatedType(const Field<Type2>& f)
         {
-            return tmp<Field<Type>>(new Field<Type>(f.size()));
+            return tmp<Field<Type>>::New(f.size());
         }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index c09b3ad563..de5dd948bf 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -118,7 +118,7 @@ public:
         template<class Type>
         tmp<Field<Type>> operator()(const Field<Type>& f) const
         {
-            return tmp<Field<Type>>(new Field<Type>(f, *this));
+            return tmp<Field<Type>>::New(f, *this);
         }
 };
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index b2016d79a3..19dcfab134 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -149,7 +149,7 @@ Foam::pointPatchField<Type>::patchInternalField
             << abort(FatalError);
     }
 
-    return tmp<Field<Type1>>(new Field<Type1>(iF, meshPoints));
+    return tmp<Field<Type1>>::New(iF, meshPoints);
 }
 
 
diff --git a/src/OpenFOAM/graph/curve/curve.H b/src/OpenFOAM/graph/curve/curve.H
index 2d8a8c9941..c9a34374c8 100644
--- a/src/OpenFOAM/graph/curve/curve.H
+++ b/src/OpenFOAM/graph/curve/curve.H
@@ -145,7 +145,7 @@ public:
 
         autoPtr<curve> clone() const
         {
-            return autoPtr<curve>(new curve(*this));
+            return autoPtr<curve>::New(*this);
         }
 
 
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index 4026e203bd..56de4eb76a 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
@@ -98,7 +98,7 @@ public:
 
         static autoPtr<procLduInterface> New(Istream& is)
         {
-            return autoPtr<procLduInterface>(new procLduInterface(is));
+            return autoPtr<procLduInterface>::New(is);
         }
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
index ad3de4764c..468297c2a5 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
@@ -89,20 +89,15 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction
-        (
-            preconditionerDict
-        )   << "cannot preconditione incomplete matrix, "
-               "no diagonal or off-diagonal coefficient"
-            << exit(FatalIOError);
 
-        return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
-        (
-            nullptr
-        );
-    }
+    FatalIOErrorInFunction
+    (
+        preconditionerDict
+    )   << "cannot preconditione incomplete matrix, "
+           "no diagonal or off-diagonal coefficient"
+        << exit(FatalIOError);
+
+    return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
index 758dafff9a..dd27fc51c2 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
@@ -84,17 +84,12 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction(smootherDict)
-            << "cannot solve incomplete matrix, no off-diagonal coefficients"
-            << exit(FatalIOError);
 
-        return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
-        (
-            nullptr
-        );
-    }
+    FatalIOErrorInFunction(smootherDict)
+        << "cannot solve incomplete matrix, no off-diagonal coefficients"
+        << exit(FatalIOError);
+
+    return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index 6ca7b2a64c..626301066e 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -99,18 +99,13 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction(solverDict)
-            << "cannot solve incomplete matrix, "
-               "no diagonal or off-diagonal coefficient"
-            << exit(FatalIOError);
 
-        return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
-        (
-            nullptr
-        );
-    }
+    FatalIOErrorInFunction(solverDict)
+        << "cannot solve incomplete matrix, "
+           "no diagonal or off-diagonal coefficient"
+        << exit(FatalIOError);
+
+    return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index deed75bd45..d8503b5ce1 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -40,7 +40,7 @@ template<class Form, class Type>
 inline Foam::autoPtr<Foam::Matrix<Form, Type>> Foam::Matrix<Form, Type>::
 clone() const
 {
-    return autoPtr<Matrix<Form, Type>>(new Matrix<Form, Type>(*this));
+    return autoPtr<Matrix<Form, Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index e07888e25b..47843ac299 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -110,10 +110,7 @@ template<class Type>
 inline Foam::autoPtr<Foam::RectangularMatrix<Type>>
 Foam::RectangularMatrix<Type>::clone() const
 {
-    return autoPtr<RectangularMatrix<Type>>
-    (
-        new RectangularMatrix<Type>(*this)
-    );
+    return autoPtr<RectangularMatrix<Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index b85715ff07..375492b250 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -148,7 +148,7 @@ template<class Type>
 inline Foam::autoPtr<Foam::SquareMatrix<Type>>
 Foam::SquareMatrix<Type>::clone() const
 {
-    return autoPtr<SquareMatrix<Type>>(new SquareMatrix<Type>(*this));
+    return autoPtr<SquareMatrix<Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index 333da73f5d..4fd590411d 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -88,10 +88,7 @@ template<class Type>
 inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type>>
 Foam::SymmetricSquareMatrix<Type>::clone() const
 {
-    return autoPtr<SymmetricSquareMatrix<Type>>
-    (
-        new SymmetricSquareMatrix<Type>(*this)
-    );
+    return autoPtr<SymmetricSquareMatrix<Type>>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index 4fd508c6bf..27f8c3687d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -130,17 +130,15 @@ Foam::lduMatrix::preconditioner::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction
-        (
-            controls
-        )   << "cannot solve incomplete matrix, "
-               "no diagonal or off-diagonal coefficient"
-            << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::preconditioner>();
-    }
+    FatalIOErrorInFunction
+    (
+        controls
+    )   << "cannot solve incomplete matrix, "
+           "no diagonal or off-diagonal coefficient"
+        << exit(FatalIOError);
+
+    return autoPtr<lduMatrix::preconditioner>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 71c9475d39..731d4c89b3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -136,15 +136,13 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction(solverControls)
-            << "cannot solve incomplete matrix, "
-               "no diagonal or off-diagonal coefficient"
-            << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::smoother>();
-    }
+    FatalIOErrorInFunction(solverControls)
+        << "cannot solve incomplete matrix, "
+        "no diagonal or off-diagonal coefficient"
+        << exit(FatalIOError);
+
+    return autoPtr<lduMatrix::smoother>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index 38e10b12e5..4b0a2092ec 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -116,15 +116,13 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
             )
         );
     }
-    else
-    {
-        FatalIOErrorInFunction(solverControls)
-            << "cannot solve incomplete matrix, "
-               "no diagonal or off-diagonal coefficient"
-            << exit(FatalIOError);
 
-        return autoPtr<lduMatrix::solver>();
-    }
+    FatalIOErrorInFunction(solverControls)
+        << "cannot solve incomplete matrix, "
+        "no diagonal or off-diagonal coefficient"
+        << exit(FatalIOError);
+
+    return autoPtr<lduMatrix::solver>();
 }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
index d1f08405fc..9c8998ac1c 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
@@ -157,13 +157,13 @@ public:
         //- Return a new cellModel on free-store created from Istream
         static autoPtr<cellModel> New(Istream& is)
         {
-            return autoPtr<cellModel>(new cellModel(is));
+            return autoPtr<cellModel>::New(is);
         }
 
         //- Return clone
         autoPtr<cellModel> clone() const
         {
-            return autoPtr<cellModel>(new cellModel(*this));
+            return autoPtr<cellModel>::New(*this);
         }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
index ad1443b679..42dfd3f4e8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
@@ -77,7 +77,7 @@ inline Foam::cellShape::cellShape(Istream& is)
 
 inline Foam::autoPtr<Foam::cellShape> Foam::cellShape::clone() const
 {
-    return autoPtr<cellShape>(new cellShape(*this));
+    return autoPtr<cellShape>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index d1fc64caea..b97a0c81e1 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -498,7 +498,7 @@ Foam::mapDistribute::mapDistribute(Istream& is)
 
 Foam::autoPtr<Foam::mapDistribute> Foam::mapDistribute::clone() const
 {
-    return autoPtr<mapDistribute>(new mapDistribute(*this));
+    return autoPtr<mapDistribute>::New(*this);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index b840b7d8d8..5010532693 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -149,7 +149,7 @@ Foam::autoPtr<Foam::labelIOList> Foam::polyMesh::readTetBasePtIs() const
 
     if (io.typeHeaderOk<labelIOList>(true))
     {
-        return autoPtr<labelIOList>(new labelIOList(io));
+        return autoPtr<labelIOList>::New(io);
     }
 
     return autoPtr<labelIOList>();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 7759f9c546..ef2ec98080 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -231,7 +231,7 @@ public:
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {
-            return autoPtr<polyPatch>(new polyPatch(*this, bm));
+            return autoPtr<polyPatch>::New(*this, bm);
         }
 
         //- Construct and return a clone, resetting the face list
@@ -244,10 +244,7 @@ public:
             const label newStart
         ) const
         {
-            return autoPtr<polyPatch>
-            (
-                new polyPatch(*this, bm, index, newSize, newStart)
-            );
+            return autoPtr<polyPatch>::New(*this, bm, index, newSize, newStart);
         }
 
         //- Construct and return a clone, resetting the face list
@@ -260,10 +257,8 @@ public:
             const label newStart
         ) const
         {
-            return autoPtr<polyPatch>
-            (
-                new polyPatch(*this, bm, index, mapAddressing, newStart)
-            );
+            return autoPtr<polyPatch>::New
+                (*this, bm, index, mapAddressing, newStart);
         }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index fe39d79d24..7f6f4e9785 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -182,10 +182,7 @@ public:
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<cellZone> clone(const cellZoneMesh& zm) const
         {
-            return autoPtr<cellZone>
-            (
-                new cellZone(*this, *this, index(), zm)
-            );
+            return autoPtr<cellZone>::New(*this, *this, index(), zm);
         }
 
         //- Construct and return a clone,
@@ -197,10 +194,7 @@ public:
             const cellZoneMesh& zm
         ) const
         {
-            return autoPtr<cellZone>
-            (
-                new cellZone(*this, addr, index, zm)
-            );
+            return autoPtr<cellZone>::New(*this, addr, index, zm);
         }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 0d1d6607eb..25688b3a99 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -228,10 +228,7 @@ public:
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<faceZone> clone(const faceZoneMesh& zm) const
         {
-            return autoPtr<faceZone>
-            (
-                new faceZone(*this, *this, flipMap(), index(), zm)
-            );
+            return autoPtr<faceZone>::New(*this, *this, flipMap(), index(), zm);
         }
 
         //- Construct and return a clone,
@@ -244,10 +241,7 @@ public:
             const faceZoneMesh& zm
         ) const
         {
-            return autoPtr<faceZone>
-            (
-                new faceZone(*this, addr, fm, index, zm)
-            );
+            return autoPtr<faceZone>::New(*this, addr, fm, index, zm);
         }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index a42d49e1c9..4979d83d38 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -183,10 +183,7 @@ public:
         //- Construct and return a clone, resetting the zone mesh
         virtual autoPtr<pointZone> clone(const pointZoneMesh& zm) const
         {
-            return autoPtr<pointZone>
-            (
-                new pointZone(*this, *this, index(), zm)
-            );
+            return autoPtr<pointZone>::New(*this, *this, index(), zm);
         }
 
         //- Construct and return a clone, resetting the point list
@@ -198,10 +195,7 @@ public:
             const labelUList& addr
         ) const
         {
-            return autoPtr<pointZone>
-            (
-                new pointZone(*this, addr, index, zm)
-            );
+            return autoPtr<pointZone>::New(*this, addr, index, zm);
         }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index d72e0c0de7..aa2312d27a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -90,7 +90,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::Constant<Type>::value
     const scalarField& x
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(x.size(), value_));
+    return tmp<Field<Type>>::New(x.size(), value_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
index 707abfc1c1..31f0972ac9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
@@ -60,7 +60,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::OneConstant<Type>::value
     const scalarField& x
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(x.size(), pTraits<Type>::one));
+    return tmp<Field<Type>>::New(x.size(), pTraits<Type>::one);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
index 3dff56b9a0..139a9b78dd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
@@ -75,7 +75,7 @@ Foam::Function1Types::Constant<Foam::label>::integrate
 ) const
 {
     NotImplemented;
-    return tmp<Field<label>>(new Field<label>(x1.size()));
+    return tmp<Field<label>>::New(x1.size());
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
index bf65cced1d..81b1ac9076 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 scalarField(patch().size(), 0.0));
+    return tmp<scalarField>::New(patch().size(), 0.0);
 }
 
 
diff --git a/src/conversion/ccm/reader/ccmReaderSolution.C b/src/conversion/ccm/reader/ccmReaderSolution.C
index 76c6fb363a..7abc4ab3e0 100644
--- a/src/conversion/ccm/reader/ccmReaderSolution.C
+++ b/src/conversion/ccm/reader/ccmReaderSolution.C
@@ -377,7 +377,7 @@ Foam::ccm::reader::readField
      || !fieldTable_.found(fieldName)
     )
     {
-        return tmp<scalarField>(new Field<scalar>());
+        return tmp<scalarField>::New();
     }
 
     CCMIODataLocation requestedLocation = kCCMIOCell;
@@ -395,7 +395,7 @@ Foam::ccm::reader::readField
     // we can skip empty fields immediately
     if (!maxId)
     {
-        return tmp<scalarField>(new Field<scalar>());
+        return tmp<scalarField>::New();
     }
 
     char shortName[kCCMIOProstarShortNameLength+1];
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
index 38c1d6b91e..9655b995bb 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
@@ -75,7 +75,7 @@ Foam::boundaryPatch::boundaryPatch(const boundaryPatch& p, const label index)
 
 Foam::autoPtr<Foam::boundaryPatch> Foam::boundaryPatch::clone() const
 {
-    return autoPtr<boundaryPatch>(new boundaryPatch(*this));
+    return autoPtr<boundaryPatch>::New(*this);
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 8414ab51cf..9ae35e31e7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3204,51 +3204,48 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
 
     labelHashSet flipFaceFluxSet(getSetIndices(flipFaceFlux_));
 
-    return autoPtr<mapPolyMesh>
+    return autoPtr<mapPolyMesh>::New
     (
-        new mapPolyMesh
-        (
-            mesh,
-            nOldPoints,
-            nOldFaces,
-            nOldCells,
+        mesh,
+        nOldPoints,
+        nOldFaces,
+        nOldCells,
 
-            pointMap_,
-            pointsFromPoints,
+        pointMap_,
+        pointsFromPoints,
 
-            faceMap_,
-            facesFromPoints,
-            facesFromEdges,
-            facesFromFaces,
+        faceMap_,
+        facesFromPoints,
+        facesFromEdges,
+        facesFromFaces,
 
-            cellMap_,
-            cellsFromPoints,
-            cellsFromEdges,
-            cellsFromFaces,
-            cellsFromCells,
+        cellMap_,
+        cellsFromPoints,
+        cellsFromEdges,
+        cellsFromFaces,
+        cellsFromCells,
 
-            reversePointMap_,
-            reverseFaceMap_,
-            reverseCellMap_,
+        reversePointMap_,
+        reverseFaceMap_,
+        reverseCellMap_,
 
-            flipFaceFluxSet,
+        flipFaceFluxSet,
 
-            patchPointMap,
+        patchPointMap,
 
-            pointZoneMap,
+        pointZoneMap,
 
-            faceZonePointMap,
-            faceZoneFaceMap,
-            cellZoneMap,
+        faceZonePointMap,
+        faceZoneFaceMap,
+        cellZoneMap,
 
-            newPoints,          // if empty signals no inflation.
-            oldPatchStarts,
-            oldPatchNMeshPoints,
+        newPoints,          // if empty signals no inflation.
+        oldPatchStarts,
+        oldPatchNMeshPoints,
 
-            oldCellVolumes,
+        oldCellVolumes,
 
-            true                // steal storage.
-        )
+        true                // steal storage.
     );
 
     // At this point all member DynamicList (pointMap_, cellMap_ etc.) will
@@ -3498,49 +3495,46 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
 
     labelHashSet flipFaceFluxSet(getSetIndices(flipFaceFlux_));
 
-    return autoPtr<mapPolyMesh>
+    return autoPtr<mapPolyMesh>::New
     (
-        new mapPolyMesh
-        (
-            newMesh,
-            nOldPoints,
-            nOldFaces,
-            nOldCells,
+        newMesh,
+        nOldPoints,
+        nOldFaces,
+        nOldCells,
 
-            pointMap_,
-            pointsFromPoints,
+        pointMap_,
+        pointsFromPoints,
 
-            faceMap_,
-            facesFromPoints,
-            facesFromEdges,
-            facesFromFaces,
+        faceMap_,
+        facesFromPoints,
+        facesFromEdges,
+        facesFromFaces,
 
-            cellMap_,
-            cellsFromPoints,
-            cellsFromEdges,
-            cellsFromFaces,
-            cellsFromCells,
+        cellMap_,
+        cellsFromPoints,
+        cellsFromEdges,
+        cellsFromFaces,
+        cellsFromCells,
 
-            reversePointMap_,
-            reverseFaceMap_,
-            reverseCellMap_,
+        reversePointMap_,
+        reverseFaceMap_,
+        reverseCellMap_,
 
-            flipFaceFluxSet,
+        flipFaceFluxSet,
 
-            patchPointMap,
+        patchPointMap,
 
-            pointZoneMap,
+        pointZoneMap,
 
-            faceZonePointMap,
-            faceZoneFaceMap,
-            cellZoneMap,
+        faceZonePointMap,
+        faceZoneFaceMap,
+        cellZoneMap,
 
-            newPoints,          // if empty signals no inflation.
-            oldPatchStarts,
-            oldPatchNMeshPoints,
-            oldCellVolumes,
-            true                // steal storage.
-        )
+        newPoints,          // if empty signals no inflation.
+        oldPatchStarts,
+        oldPatchNMeshPoints,
+        oldCellVolumes,
+        true                // steal storage.
     );
 
     // At this point all member DynamicList (pointMap_, cellMap_ etc.) will
diff --git a/src/engine/ignition/ignitionSite.H b/src/engine/ignition/ignitionSite.H
index e8d3db5340..6a8959f40c 100644
--- a/src/engine/ignition/ignitionSite.H
+++ b/src/engine/ignition/ignitionSite.H
@@ -105,7 +105,7 @@ public:
 
             autoPtr<ignitionSite> operator()(Istream& is) const
             {
-                return autoPtr<ignitionSite>(new ignitionSite(is, db_, mesh_));
+                return autoPtr<ignitionSite>::New(is, db_, mesh_);
             }
         };
 
@@ -121,7 +121,7 @@ public:
         //- Clone
         autoPtr<ignitionSite> clone() const
         {
-            return autoPtr<ignitionSite>(new ignitionSite(*this));
+            return autoPtr<ignitionSite>::New(*this);
         }
 
 
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
index 92662f9982..2646b427d1 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
@@ -337,7 +337,7 @@ Foam::tmp<Foam::vectorField> Foam::faPatch::ngbPolyPatchPointNormals() const
 {
     if (ngbPolyPatchIndex() == -1)
     {
-        return tmp<vectorField>(new vectorField());
+        return tmp<vectorField>::New();
     }
 
     const labelListList& pntEdges = pointEdges();
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
index 2ba2a59116..0f1e25ebdf 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
@@ -196,10 +196,9 @@ public:
             const label ngbPolyPatchIndex
         ) const
         {
-            return autoPtr<faPatch>
-            (
-                new faPatch(name(), edgeLabels, index, bm, ngbPolyPatchIndex)
-            );
+            return
+                autoPtr<faPatch>::New
+                (name(), edgeLabels, index, bm, ngbPolyPatchIndex);
         }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
index 78d9f156a7..6439771b88 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
index 1a23e05ebe..415ef43417 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
@@ -146,7 +146,7 @@ Foam::fixedGradientFaPatchField<Type>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(this->size(), pTraits<Type>::one));
+    return tmp<Field<Type>>::New(this->size(), pTraits<Type>::one);
 }
 
 
@@ -165,10 +165,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFaPatchField<Type>::gradientInternalCoeffs() const
 {
-    return tmp<Field<Type>>
-    (
-        new Field<Type>(this->size(), pTraits<Type>::zero)
-    );
+    return tmp<Field<Type>>::New(this->size(), pTraits<Type>::zero);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
index bb88cbb7c4..a542672135 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H
index 1fcfcc0020..2aec133972 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H
@@ -165,7 +165,7 @@ public:
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix source coefficients corresponding to the
@@ -175,21 +175,21 @@ public:
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
             tmp<Field<Type>> gradientInternalCoeffs() const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
             tmp<Field<Type>> gradientBoundaryCoeffs() const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 };
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
index 0b4fa844ea..0752c8b6d2 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
index 40f3f5467f..df339b13f8 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index a7a8a8562f..29fca32ad7 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -155,7 +155,7 @@ Foam::fixedGradientFvPatchField<Type>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(this->size(), pTraits<Type>::one));
+    return tmp<Field<Type>>::New(this->size(), pTraits<Type>::one);
 }
 
 
@@ -174,10 +174,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    return tmp<Field<Type>>
-    (
-        new Field<Type>(this->size(), Zero)
-    );
+    return tmp<Field<Type>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
index 81947be896..16adba3f61 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
@@ -34,7 +34,7 @@ Foam::transformFvPatchField<Foam::scalar>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-     return tmp<scalarField>(new scalarField(size(), 1.0));
+    return tmp<scalarField>::New(size(), 1.0);
 }
 
 
@@ -42,7 +42,7 @@ template<>
 Foam::tmp<Foam::scalarField>
 Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
 {
-    return tmp<scalarField>(new scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
index b6b90e98a7..47aae49ccd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
@@ -170,7 +170,7 @@ public:
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix source coefficients corresponding to the
@@ -180,21 +180,21 @@ public:
                 const tmp<scalarField>&
             ) const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix diagonal coefficients corresponding to the
             //  evaluation of the gradient of this patchField
             tmp<Field<Type>> gradientInternalCoeffs() const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 
             //- Return the matrix source coefficients corresponding to the
             //  evaluation of the gradient of this patchField
             tmp<Field<Type>> gradientBoundaryCoeffs() const
             {
-                return tmp<Field<Type>>(new Field<Type>(0));
+                return tmp<Field<Type>>::New();
             }
 };
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
index 4f43940626..8a330b9b7e 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
index c82ed7f7a6..4a95611c80 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 scalarField(size(), 0.0));
+    return tmp<scalarField>::New(size(), 0.0);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 71d4a8ffd6..fa8c5fb42d 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -219,7 +219,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this));
+            return tmp<fvPatchField<Type>>::New(*this);
         }
 
         //- Construct as copy setting internal field reference
@@ -235,7 +235,7 @@ public:
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this, iF));
+            return tmp<fvPatchField<Type>>::New(*this, iF);
         }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 1b9f0aa2ac..3be7ba351c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -185,7 +185,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvsPatchField<Type>> clone() const
         {
-            return tmp<fvsPatchField<Type>>(new fvsPatchField<Type>(*this));
+            return tmp<fvsPatchField<Type>>::New(*this);
         }
 
         //- Construct as copy setting internal field reference
@@ -201,10 +201,7 @@ public:
             const DimensionedField<Type, surfaceMesh>& iF
         ) const
         {
-            return tmp<fvsPatchField<Type>>
-            (
-                new fvsPatchField<Type>(*this, iF)
-            );
+            return tmp<fvsPatchField<Type>>::New(*this, iF);
         }
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index b6820ee887..afbb8a90fe 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -221,17 +221,14 @@ Foam::cellToCellStencil::allCoupledFacesPatch() const
         }
     }
 
-    return autoPtr<indirectPrimitivePatch>
+    return autoPtr<indirectPrimitivePatch>::New
     (
-        new indirectPrimitivePatch
+        IndirectList<face>
         (
-            IndirectList<face>
-            (
-                mesh().faces(),
-                coupledFaces
-            ),
-            mesh().points()
-        )
+            mesh().faces(),
+            coupledFaces
+        ),
+        mesh().points()
     );
 }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index 4b0aa39c00..46275af0ff 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -222,17 +222,14 @@ Foam::cellToFaceStencil::allCoupledFacesPatch() const
         }
     }
 
-    return autoPtr<indirectPrimitivePatch>
+    return autoPtr<indirectPrimitivePatch>::New
     (
-        new indirectPrimitivePatch
+        IndirectList<face>
         (
-            IndirectList<face>
-            (
-                mesh().faces(),
-                coupledFaces
-            ),
-            mesh().points()
-        )
+            mesh().faces(),
+            coupledFaces
+        ),
+        mesh().points()
     );
 }
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
index dce9cc4759..dc4736817a 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 labelField(iF.size(), 0));
+    return tmp<labelField>::New(iF.size(), 0);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
index 5662a8103e..e7b694722d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
@@ -59,7 +59,8 @@ internalFieldTransfer
         return neighbFvPatch().patchInternalField(iF);
     }
 
-    return tmp<labelField>(new labelField(iF.size(), 0));
+    return tmp<labelField>::New(iF.size(), 0);
 }
 
+
 // ************************************************************************* //
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
index 5852047488..cdc54e8afb 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
@@ -136,7 +136,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
             << abort(FatalError);
     }
 
-    return tmp<Field<Type>>(new Field<Type>(0));
+    return tmp<Field<Type>>::New();
 }
 
 
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
index 09b9931808..c74056862c 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
@@ -67,7 +67,7 @@ Foam::functionObjects::fieldValues::volFieldValue::getFieldValues
             << abort(FatalError);
     }
 
-    return tmp<Field<Type>>(new Field<Type>(0.0));
+    return tmp<Field<Type>>::New(Zero);
 }
 
 
@@ -266,7 +266,7 @@ Foam::functionObjects::fieldValues::volFieldValue::filterField
     }
     else
     {
-        return tmp<Field<Type>>(new Field<Type>(field, cellIDs()));
+        return tmp<Field<Type>>::New(field, cellIDs());
     }
 }
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
index 9dc7ba2ea8..b6fcdc3137 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
@@ -54,7 +54,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::rho(const label patchi) const
     if (rhoName_ == "rhoInf")
     {
         const label n = mesh_.boundary()[patchi].size();
-        return tmp<Field<scalar>>(new Field<scalar>(n, rhoRef_));
+        return tmp<Field<scalar>>::New(n, rhoRef_);
     }
     else if (mesh_.foundObject<volScalarField>(rhoName_, false))
     {
@@ -77,7 +77,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::Cp(const label patchi) const
     if (CpName_ == "CpInf")
     {
         const label n = mesh_.boundary()[patchi].size();
-        return tmp<Field<scalar>>(new Field<scalar>(n, CpRef_));
+        return tmp<Field<scalar>>::New(n, CpRef_);
     }
     else if (mesh_.foundObject<fluidThermo>(fluidThermo::typeName))
     {
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index d5730ec1ba..7d2a8d3ea6 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -111,17 +111,14 @@ Foam::functionObjects::streamLineBase::wallPatch() const
         }
     }
 
-    return autoPtr<indirectPrimitivePatch>
+    return autoPtr<indirectPrimitivePatch>::New
     (
-        new indirectPrimitivePatch
+        IndirectList<face>
         (
-            IndirectList<face>
-            (
-                mesh_.faces(),
-                addressing
-            ),
-            mesh_.points()
-        )
+            mesh_.faces(),
+            addressing
+        ),
+        mesh_.points()
     );
 }
 
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 311df77f7d..479af608a5 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -170,7 +170,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
         }
     }
 
-    return tmp<labelField>(new labelField(finalAgglom));
+    return tmp<labelField>::New(finalAgglom);
 }
 
 
diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
index 5210b6e286..932618bf4d 100644
--- a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
+++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
@@ -62,7 +62,7 @@ Foam::motionInterpolation::motionInterpolation
 Foam::autoPtr<Foam::motionInterpolation>
 Foam::motionInterpolation::New(const fvMesh& mesh)
 {
-    return autoPtr<motionInterpolation>(new motionInterpolation(mesh));
+    return autoPtr<motionInterpolation>::New(mesh);
 }
 
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 73ad3e2c89..ac8bcf0c37 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -441,10 +441,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
         case ifFixed:
         case ifSurfaceNormal:
         {
-            return tmp<vectorField>
-            (
-                new vectorField(mesh_.nCells(), inletVelocity_)
-            );
+            return tmp<vectorField>::New(mesh_.nCells(), inletVelocity_);
 
             break;
         }
@@ -461,7 +458,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
         }
     }
 
-    return tmp<vectorField>(new vectorField(mesh_.nCells(), Zero));
+    return tmp<vectorField>::New(mesh_.nCells(), Zero);
 }
 
 
diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index ef9feafde3..44d8d079ee 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -419,7 +419,7 @@ public:
         //- Construct a clone
         virtual autoPtr<particle> clone() const
         {
-            return autoPtr<particle>(new particle(*this));
+            return autoPtr<particle>::New(*this);
         }
 
         //- Factory class to read-construct particles used for
@@ -437,7 +437,7 @@ public:
 
             autoPtr<particle> operator()(Istream& is) const
             {
-                return autoPtr<particle>(new particle(mesh_, is, true));
+                return autoPtr<particle>::New(mesh_, is, true);
             }
         };
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index bdb245e6e5..5d3d8d233f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -447,7 +447,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
         }
     }
 
-    return tmp<fvVectorMatrix>(new fvVectorMatrix(U, dimForce));
+    return tmp<fvVectorMatrix>::New(U, dimForce);
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 7aa240ba2a..167c44cc00 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -149,7 +149,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
         }
     }
 
-    return tmp<fvScalarMatrix>(new fvScalarMatrix(Yi, dimMass/dimTime));
+    return tmp<fvScalarMatrix>::New(Yi, dimMass/dimTime);
 }
 
 
@@ -285,7 +285,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
         }
     }
 
-    return tmp<fvScalarMatrix>(new fvScalarMatrix(rho, dimMass/dimTime));
+    return tmp<fvScalarMatrix>::New(rho, dimMass/dimTime);
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index d36a15421b..66a9b2df9b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -255,7 +255,7 @@ Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
         }
     }
 
-    return tmp<fvScalarMatrix>(new fvScalarMatrix(hs, dimEnergy/dimTime));
+    return tmp<fvScalarMatrix>::New(hs, dimEnergy/dimTime);
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index a33f20ed2d..f59575c809 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -301,7 +301,7 @@ public:
 
             autoPtr<molecule> operator()(Istream& is) const
             {
-                return autoPtr<molecule>(new molecule(mesh_, is, true));
+                return autoPtr<molecule>::New(mesh_, is, true);
             }
         };
 
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.C b/src/lumpedPointMotion/lumpedPointIOMovement.C
index dbe1fde102..03b005d107 100644
--- a/src/lumpedPointMotion/lumpedPointIOMovement.C
+++ b/src/lumpedPointMotion/lumpedPointIOMovement.C
@@ -53,21 +53,18 @@ Foam::lumpedPointIOMovement::New
     label ownerId
 )
 {
-    return autoPtr<lumpedPointIOMovement>
+    return autoPtr<lumpedPointIOMovement>::New
     (
-        new lumpedPointIOMovement
+        IOobject
         (
-            IOobject
-            (
-                lumpedPointMovement::dictionaryName,
-                obr.time().caseSystem(),
-                obr,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                true // register object
-            ),
-            ownerId  // tag this patch as owner too
-        )
+            lumpedPointMovement::dictionaryName,
+            obr.time().caseSystem(),
+            obr,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            true // register object
+        ),
+        ownerId  // tag this patch as owner too
     );
 }
 
diff --git a/src/lumpedPointMotion/lumpedPointTools.C b/src/lumpedPointMotion/lumpedPointTools.C
index fa4e741d01..e842aa8c50 100644
--- a/src/lumpedPointMotion/lumpedPointTools.C
+++ b/src/lumpedPointMotion/lumpedPointTools.C
@@ -46,22 +46,19 @@ namespace Foam
             Info<< "Reading " << GeoFieldType::typeName
                 << ' ' << io->name() << endl;
 
-            return autoPtr<GeoFieldType>
+            return autoPtr<GeoFieldType>::New
             (
-                new GeoFieldType
+                IOobject
                 (
-                    IOobject
-                    (
-                        io->name(),
-                        io->instance(),
-                        io->local(),
-                        io->db(),
-                        IOobject::MUST_READ,
-                        IOobject::AUTO_WRITE,
-                        io->registerObject()
-                    ),
-                    mesh
-                )
+                    io->name(),
+                    io->instance(),
+                    io->local(),
+                    io->db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    io->registerObject()
+                ),
+                mesh
             );
         }
 
diff --git a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
index 9dcf58c9b0..902295182e 100644
--- a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
+++ b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
@@ -92,15 +92,13 @@ Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::New
 
         return autoPtr<blockVertex>(cstrIter()(dict, index, geometry, is));
     }
-    else
-    {
-        FatalIOErrorInFunction(is)
-            << "incorrect first token, expected <word> or '(', found "
-            << firstToken.info()
-            << exit(FatalIOError);
 
-        return autoPtr<blockVertex>();
-    }
+    FatalIOErrorInFunction(is)
+        << "incorrect first token, expected <word> or '(', found "
+        << firstToken.info()
+        << exit(FatalIOError);
+
+    return autoPtr<blockVertex>();
 }
 
 
diff --git a/src/mesh/blockMesh/blocks/block/block.C b/src/mesh/blockMesh/blocks/block/block.C
index 481e2ed880..143994ab55 100644
--- a/src/mesh/blockMesh/blocks/block/block.C
+++ b/src/mesh/blockMesh/blocks/block/block.C
@@ -78,28 +78,15 @@ Foam::autoPtr<Foam::block> Foam::block::New
 
     const word blockOrCellShapeType(is);
 
-    auto cstrIter = IstreamConstructorTablePtr_->cfind(blockOrCellShapeType);
+    auto cstr = IstreamConstructorTablePtr_->cfind(blockOrCellShapeType);
 
-    if (!cstrIter.found())
+    if (!cstr.found())
     {
         is.putBack(token(blockOrCellShapeType));
-        return autoPtr<block>(new block(dict, index, points, edges, faces, is));
-    }
-    else
-    {
-        return autoPtr<block>
-        (
-            cstrIter()
-            (
-                dict,
-                index,
-                points,
-                edges,
-                faces,
-                is
-            )
-        );
+        return autoPtr<block>::New(dict, index, points, edges, faces, is);
     }
+
+    return autoPtr<block>(cstr()(dict, index, points, edges, faces, is));
 }
 
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 7e40b1e95f..5f4d801403 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -88,7 +88,7 @@ Foam::displacementMeshMoverMotionSolver::curPoints() const
 {
     // Return actual points. Cannot do a reference since complains about
     // assignment to self in polyMesh::movePoints
-    return tmp<pointField>(new pointField(mesh().points()));
+    return tmp<pointField>::New(mesh().points());
 }
 
 
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 4da5721d72..43ee2771ad 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -103,13 +103,10 @@ Foam::externalDisplacementMeshMover::getPatch
         }
     }
 
-    return autoPtr<indirectPrimitivePatch>
+    return autoPtr<indirectPrimitivePatch>::New
     (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>(mesh.faces(), addressing),
-            mesh.points()
-        )
+        IndirectList<face>(mesh.faces(), addressing),
+        mesh.points()
     );
 }
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 84c895a95a..89f27066c8 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1648,13 +1648,10 @@ Foam::autoPtr<Foam::indirectPrimitivePatch> Foam::meshRefinement::makePatch
         }
     }
 
-    return autoPtr<indirectPrimitivePatch>
+    return autoPtr<indirectPrimitivePatch>::New
     (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>(mesh.faces(), addressing),
-            mesh.points()
-        )
+        IndirectList<face>(mesh.faces(), addressing),
+        mesh.points()
     );
 }
 
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index c99c7251ed..94ce042ab3 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -137,7 +137,7 @@ public:
         //- Return clone
         autoPtr<surfaceZonesInfo> clone() const
         {
-            return autoPtr<surfaceZonesInfo>(new surfaceZonesInfo(*this));
+            return autoPtr<surfaceZonesInfo>::New(*this);
         }
 
 
diff --git a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
index d5266f4a66..bb683ac52b 100644
--- a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
@@ -160,7 +160,7 @@ public:
         //- Construct and return a clone
         autoPtr<particle> clone() const
         {
-            return autoPtr<particle>(new trackedParticle(*this));
+            return autoPtr<particle>::NewFrom<trackedParticle>(*this);
         }
 
         //- Factory class to read-construct particles used for
@@ -178,10 +178,7 @@ public:
 
             autoPtr<trackedParticle> operator()(Istream& is) const
             {
-                return autoPtr<trackedParticle>
-                (
-                    new trackedParticle(mesh_, is, true)
-                );
+                return autoPtr<trackedParticle>::New(mesh_, is, true);
             }
         };
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
index 5e21fb5be5..50c2009c34 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
@@ -179,7 +179,7 @@ public:
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {
-            return autoPtr<polyPatch>(new cyclicACMIPolyPatch(*this, bm));
+            return autoPtr<polyPatch>::NewFrom<cyclicACMIPolyPatch>(*this, bm);
         }
 
         //- Construct and return a clone, resetting the face list
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index 6963aa9d25..287ea33f83 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
@@ -220,7 +220,7 @@ public:
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {
-            return autoPtr<polyPatch>(new cyclicAMIPolyPatch(*this, bm));
+            return autoPtr<polyPatch>::NewFrom<cyclicAMIPolyPatch>(*this, bm);
         }
 
         //- Construct and return a clone, resetting the face list
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
index 53ee185b68..6b2c44f809 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
@@ -138,13 +138,9 @@ public:
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
-            return autoPtr<coordinateRotation>
-            (
-                new EulerCoordinateRotation
-                (
-                    *this
-                )
-            );
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <EulerCoordinateRotation>(*this);
         }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
index b76da859d1..13625e34ba 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
@@ -131,13 +131,9 @@ public:
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
-            return autoPtr<coordinateRotation>
-            (
-                new STARCDCoordinateRotation
-                (
-                    *this
-                )
-            );
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <STARCDCoordinateRotation>(*this);
         }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
index ca974fc0e9..4ac0a04928 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
@@ -132,13 +132,12 @@ public:
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
-            return autoPtr<coordinateRotation>(new axesRotation(*this));
+            return autoPtr<coordinateRotation>::NewFrom<axesRotation>(*this);
         }
 
 
     //- Destructor
-    virtual ~axesRotation()
-    {}
+    virtual ~axesRotation() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index bf2c57879b..1c3cd012cf 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -128,13 +128,12 @@ public:
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
-            return autoPtr<coordinateRotation>(new cylindrical(*this));
+            return autoPtr<coordinateRotation>::NewFrom<cylindrical>(*this);
         }
 
 
     //- Destructor
-    virtual ~cylindrical()
-    {}
+    virtual ~cylindrical() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 4d148b0814..52ee69f1d3 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -199,7 +199,7 @@ public:
     //- Return clone
     autoPtr<coordinateSystem> clone() const
     {
-        return autoPtr<coordinateSystem>(new coordinateSystem(*this));
+        return autoPtr<coordinateSystem>::New(*this);
     }
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 486a12bc89..bb4c5e9138 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 {
     const dictionary& coordDict = dict.subDict(typeName_());
 
-    return autoPtr<coordinateSystem>(new coordinateSystem(coordDict));
+    return autoPtr<coordinateSystem>::New(coordDict);
 }
 
 
@@ -74,7 +74,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
     const word name(is);
     const dictionary dict(is);
 
-    return autoPtr<coordinateSystem>(new coordinateSystem(name, dict));
+    return autoPtr<coordinateSystem>::New(name, dict);
 }
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
index 8f9d1a6bf6..3a39a1d5f5 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.H
@@ -92,16 +92,12 @@ public:
         //- Read file and return edgeMesh
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new edgeMeshFormat(name)
-            );
+            return autoPtr<edgeMesh>::NewFrom<edgeMeshFormat>(name);
         }
 
 
     //- Destructor
-    virtual ~edgeMeshFormat()
-    {}
+    virtual ~edgeMeshFormat() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
index 3582b2f59f..876140ff5e 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.H
@@ -74,16 +74,14 @@ public:
         //- Read file and return surface
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new extendedFeatureEdgeMeshFormat(name)
-            );
+            return
+                autoPtr<edgeMesh>::NewFrom
+                <extendedFeatureEdgeMeshFormat>(name);
         }
 
 
     //- Destructor
-    virtual ~extendedFeatureEdgeMeshFormat()
-    {}
+    virtual ~extendedFeatureEdgeMeshFormat() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
index c82d470acf..d5cd410c9d 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.H
@@ -82,10 +82,7 @@ public:
         //- Read file and return edge mesh
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new NASedgeFormat(name)
-            );
+            return autoPtr<edgeMesh>::NewFrom<NASedgeFormat>(name);
         }
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
index 4035782b31..1b7ff59b9a 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
@@ -78,10 +78,7 @@ public:
         //- Read file and return surface
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new OBJedgeFormat(name)
-            );
+            return autoPtr<edgeMesh>::NewFrom<OBJedgeFormat>(name);
         }
 
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
index 7bed5b3d43..246028b1fa 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
@@ -100,16 +100,12 @@ public:
         //- Read file and return edgeMesh
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new STARCDedgeFormat(name)
-            );
+            return autoPtr<edgeMesh>::NewFrom<STARCDedgeFormat>(name);
         }
 
 
     //- Destructor
-    virtual ~STARCDedgeFormat()
-    {}
+    virtual ~STARCDedgeFormat() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
index b85e134d75..3cbe13b812 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.H
@@ -90,16 +90,12 @@ public:
         //- Read file and return surface
         static autoPtr<edgeMesh> New(const fileName& name)
         {
-            return autoPtr<edgeMesh>
-            (
-                new VTKedgeFormat(name)
-            );
+            return autoPtr<edgeMesh>::NewFrom<VTKedgeFormat>(name);
         }
 
 
     //- Destructor
-    virtual ~VTKedgeFormat()
-    {}
+    virtual ~VTKedgeFormat() = default;
 
 
     // Member Functions
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 2c169ff244..3a1d74b949 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -215,7 +215,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
             compactOffsets[i] = globalToCompact.size();
         }
 
-        return autoPtr<globalIndex>(new globalIndex(std::move(compactOffsets)));
+        return autoPtr<globalIndex>::New(std::move(compactOffsets));
     }
 
 
diff --git a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
index 650bb1f3e8..5d168e6c0f 100644
--- a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
+++ b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
@@ -274,7 +274,7 @@ const Foam::wordList& Foam::searchablePlate::regions() const
 
 Foam::tmp<Foam::pointField> Foam::searchablePlate::coordinates() const
 {
-    return tmp<pointField>(new pointField(1, origin_ + 0.5*span_));
+    return tmp<pointField>::New(1, origin_ + 0.5*span_);
 }
 
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index 38551410c0..5f87ba232e 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -374,17 +374,14 @@ Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
 Foam::autoPtr<Foam::pointToPointPlanarInterpolation>
 Foam::pointToPointPlanarInterpolation::clone() const
 {
-    return autoPtr<pointToPointPlanarInterpolation>
+    return autoPtr<pointToPointPlanarInterpolation>::New
     (
-        new pointToPointPlanarInterpolation
-        (
-            perturb_,
-            nearestOnly_,
-            referenceCS_,
-            nPoints_,
-            nearestVertex_,
-            nearestVertexWeight_
-        )
+        perturb_,
+        nearestOnly_,
+        referenceCS_,
+        nPoints_,
+        nearestVertex_,
+        nearestVertexWeight_
     );
 }
 
diff --git a/src/overset/oversetPolyPatch/oversetGAMGInterface.C b/src/overset/oversetPolyPatch/oversetGAMGInterface.C
index e415533835..cae275f957 100644
--- a/src/overset/oversetPolyPatch/oversetGAMGInterface.C
+++ b/src/overset/oversetPolyPatch/oversetGAMGInterface.C
@@ -257,7 +257,7 @@ Foam::tmp<Foam::labelField> Foam::oversetGAMGInterface::internalFieldTransfer
         restrictMap_ = restrictMap;
     }
 
-    return tmp<labelField>(new labelField(restrictMap, faceCells()));
+    return tmp<labelField>::New(restrictMap, faceCells());
 }
 
 
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
index e39918ed61..fbc9a87dbd 100644
--- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
@@ -108,10 +108,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<regionModelFunctionObject> clone() const
         {
-            return autoPtr<regionModelFunctionObject>
-            (
-                new regionModelFunctionObject(*this)
-            );
+            return autoPtr<regionModelFunctionObject>::New(*this);
         }
 
 
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index 5183147005..262f3898b3 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -50,7 +50,7 @@ namespace RBD
 
 Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::clone() const
 {
-    return autoPtr<rigidBody>(new rigidBody(*this));
+    return autoPtr<rigidBody>::New(*this);
 }
 
 
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
     const symmTensor& Ic
 )
 {
-    return autoPtr<rigidBody>(new rigidBody(name, m, c, Ic));
+    return autoPtr<rigidBody>::New(name, m, c, Ic);
 }
 
 
diff --git a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
index 103330d58e..386912c1d7 100644
--- a/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
+++ b/src/rigidBodyDynamics/bodies/subBody/subBodyI.H
@@ -42,7 +42,7 @@ inline Foam::RBD::subBody::subBody
 
 inline Foam::autoPtr<Foam::RBD::subBody> Foam::RBD::subBody::clone() const
 {
-    return autoPtr<subBody>(new subBody(*this));
+    return autoPtr<subBody>::New(*this);
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
index 13a7fde3cf..ffaa1ff8c0 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
@@ -41,7 +41,7 @@ Foam::sampledIsoSurfaceCell::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
+    return tmp<Field<Type>>::New(vField, meshCells_);
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
index 55acd17b19..859c82c741 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
@@ -40,7 +40,7 @@ Foam::sampledIsoSurface::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
+    return tmp<Field<Type>>::New(vField, surface().meshCells());
 }
 
 
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
index 8756deabd0..27dade962d 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
@@ -37,7 +37,7 @@ Foam::sampledCuttingPlane::sampleField
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
+    return tmp<Field<Type>>::New(vField, surface().meshCells());
 }
 
 
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
index f081e27d74..070408490e 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
@@ -34,7 +34,7 @@ Foam::sampledPlane::sampleField
     const GeometricField<Type, fvPatchField, volMesh>& vField
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
+    return tmp<Field<Type>>::New(vField, meshCells());
 }
 
 
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
index 5058dcff4a..5e8bcb4cd0 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -42,7 +42,7 @@ Foam::sampledThresholdCellFaces::sampleField
     // Recreate geometry if time has changed
     updateGeometry();
 
-    return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
+    return tmp<Field<Type>>::New(vField, meshCells_);
 }
 
 
diff --git a/src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C b/src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C
index b774e1e254..a7e82cf14d 100644
--- a/src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C
+++ b/src/sampling/surface/cuttingPlane/cuttingPlaneTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
     const Field<Type>& fld
 ) const
 {
-    return tmp<Field<Type>>(new Field<Type>(fld, meshCells()));
+    return tmp<Field<Type>>::New(fld, meshCells());
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
index 4d6a2b8259..83aae25a9b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.H
@@ -101,10 +101,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<sixDoFSolver> clone() const
         {
-            return autoPtr<sixDoFSolver>
-            (
-                new CrankNicolson(dict_, body_)
-            );
+            return autoPtr<sixDoFSolver>::NewFrom<CrankNicolson>(dict_, body_);
         }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
index 2b1241a719..80882e7cd9 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.H
@@ -99,10 +99,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<sixDoFSolver> clone() const
         {
-            return autoPtr<sixDoFSolver>
-            (
-                new Newmark(dict_, body_)
-            );
+            return autoPtr<sixDoFSolver>::NewFrom<Newmark>(dict_, body_);
         }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
index 3e360fddd1..32295aef24 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.H
@@ -98,10 +98,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<sixDoFSolver> clone() const
         {
-            return autoPtr<sixDoFSolver>
-            (
-                new symplectic(dict_, body_)
-            );
+            return autoPtr<sixDoFSolver>::NewFrom<symplectic>(dict_, body_);
         }
 
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index 95685f11c2..7507845397 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.H
@@ -123,7 +123,7 @@ public:
             word name(is);
             dictionary dict(is);
 
-            return autoPtr<surfZone>(new surfZone(name, dict, 0));
+            return autoPtr<surfZone>::New(name, dict, 0);
         }
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H
index c761297635..9d41ffee12 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModelI.H
@@ -46,13 +46,7 @@ inline Foam::autoPtr<Foam::OFstream>
 Foam::TDACChemistryModel<CompType, ThermoType>::logFile(const word& name) const
 {
     mkDir(this->mesh().time().path()/"TDAC");
-    return autoPtr<OFstream>
-    (
-        new OFstream
-        (
-            this->mesh().time().path()/"TDAC"/name
-        )
-    );
+    return autoPtr<OFstream>::New(this->mesh().time().path()/"TDAC"/name);
 }
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index f583e43824..7e1f8d06c1 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -96,16 +96,14 @@ Foam::radiation::boundaryRadiationProperties::emissivity
     {
         return radBoundaryPropertiesPtrList_[patchi]->emissivity(bandi);
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchi].name()
-            << " is not found in the boundaryRadiationProperties. "
-            << "Please add it"
-            << exit(FatalError);
 
-        return tmp<scalarField>(new scalarField());
-    }
+    FatalErrorInFunction
+        << "Patch : " << mesh().boundaryMesh()[patchi].name()
+        << " is not found in the boundaryRadiationProperties. "
+        << "Please add it"
+        << exit(FatalError);
+
+    return tmp<scalarField>::New();
 }
 
 
@@ -120,16 +118,14 @@ Foam::radiation::boundaryRadiationProperties::absorptivity
     {
         return radBoundaryPropertiesPtrList_[patchi]->absorptivity(bandi);
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchi].name()
-            << " is not found in the boundaryRadiationProperties. "
-            << "Please add it"
-            << exit(FatalError);
 
-        return tmp<scalarField>(new scalarField());
-    }
+     FatalErrorInFunction
+         << "Patch : " << mesh().boundaryMesh()[patchi].name()
+         << " is not found in the boundaryRadiationProperties. "
+         << "Please add it"
+         << exit(FatalError);
+
+    return tmp<scalarField>::New();
 }
 
 
@@ -144,16 +140,14 @@ Foam::radiation::boundaryRadiationProperties::transmissivity
     {
         return radBoundaryPropertiesPtrList_[patchi]->transmissivity(bandi);
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchi].name()
-            << " is not found in the boundaryRadiationProperties. "
-            << "Please add it"
-            << exit(FatalError);
 
-        return tmp<scalarField>(new scalarField());
-    }
+    FatalErrorInFunction
+        << "Patch : " << mesh().boundaryMesh()[patchi].name()
+        << " is not found in the boundaryRadiationProperties. "
+        << "Please add it"
+        << exit(FatalError);
+
+    return tmp<scalarField>::New();
 }
 
 
@@ -168,16 +162,14 @@ Foam::radiation::boundaryRadiationProperties::reflectivity
     {
         return radBoundaryPropertiesPtrList_[patchi]->reflectivity(bandi);
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Patch : " << mesh().boundaryMesh()[patchi].name()
-            << " is not found in the boundaryRadiationProperties. "
-            << "Please add it"
-            << exit(FatalError);
 
-        return tmp<scalarField>(new scalarField());
-    }
+    FatalErrorInFunction
+        << "Patch : " << mesh().boundaryMesh()[patchi].name()
+        << " is not found in the boundaryRadiationProperties. "
+        << "Please add it"
+        << exit(FatalError);
+
+    return tmp<scalarField>::New();
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
index ee58b30ace..9a03c08254 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
@@ -56,10 +56,7 @@ Foam::constAnIsoSolidTransport<Thermo>::New
     const dictionary& dict
 )
 {
-    return autoPtr<constAnIsoSolidTransport<Thermo>>
-    (
-        new constAnIsoSolidTransport<Thermo>(dict)
-    );
+    return autoPtr<constAnIsoSolidTransport<Thermo>>::New(dict);
 }
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
index 0065451548..dcc6d724e3 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
@@ -56,10 +56,7 @@ Foam::constIsoSolidTransport<Thermo>::New
     const dictionary& dict
 )
 {
-    return autoPtr<constIsoSolidTransport<Thermo>>
-    (
-        new constIsoSolidTransport<Thermo>(dict)
-    );
+    return autoPtr<constIsoSolidTransport<Thermo>>::New(dict);
 }
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
index dd5e5e526f..dccc02bf6b 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
@@ -62,10 +62,7 @@ Foam::exponentialSolidTransport<Thermo>::New
     const dictionary& dict
 )
 {
-    return autoPtr<exponentialSolidTransport<Thermo>>
-    (
-        new exponentialSolidTransport<Thermo>(dict)
-    );
+    return autoPtr<exponentialSolidTransport<Thermo>>::New(dict);
 }
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index b0cc6e0384..2a60c520cd 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -57,10 +57,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::clone() const
 {
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
-    (
-        new polynomialSolidTransport<Thermo, PolySize>(*this)
-    );
+    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>::New(*this);
 }
 
 
@@ -68,10 +65,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
-    (
-        new polynomialSolidTransport<Thermo, PolySize>(dict)
-    );
+    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 814a9a1e82..5fbd631323 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -59,10 +59,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::Boussinesq<Specie>>
 Foam::Boussinesq<Specie>::clone() const
 {
-    return autoPtr<Boussinesq<Specie>>
-    (
-        new Boussinesq<Specie>(*this)
-    );
+    return autoPtr<Boussinesq<Specie>>::New(*this);
 }
 
 
@@ -73,10 +70,7 @@ Foam::Boussinesq<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<Boussinesq<Specie>>
-    (
-        new Boussinesq<Specie>(dict)
-    );
+    return autoPtr<Boussinesq<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index 85df8cea5a..747f512e67 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -70,10 +70,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::PengRobinsonGas <Specie>>
 Foam::PengRobinsonGas<Specie>::clone() const
 {
-    return autoPtr<PengRobinsonGas<Specie>>
-    (
-        new PengRobinsonGas<Specie>(*this)
-    );
+    return autoPtr<PengRobinsonGas<Specie>>::New(*this);
 }
 
 
@@ -84,10 +81,7 @@ Foam::PengRobinsonGas<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<PengRobinsonGas<Specie>>
-    (
-        new PengRobinsonGas<Specie>(dict)
-    );
+    return autoPtr<PengRobinsonGas<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
index 57424a902e..41e0ecbc2a 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
@@ -66,10 +66,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
 Foam::adiabaticPerfectFluid<Specie>::clone() const
 {
-    return autoPtr<adiabaticPerfectFluid<Specie>>
-    (
-        new adiabaticPerfectFluid<Specie>(*this)
-    );
+    return autoPtr<adiabaticPerfectFluid<Specie>>::New(*this);
 }
 
 
@@ -80,10 +77,7 @@ Foam::adiabaticPerfectFluid<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<adiabaticPerfectFluid<Specie>>
-    (
-        new adiabaticPerfectFluid<Specie>(dict)
-    );
+    return autoPtr<adiabaticPerfectFluid<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index 66edf3f842..2c1550c8f2 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -57,10 +57,7 @@ template<class Specie, int PolySize>
 inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::clone() const
 {
-    return autoPtr<icoPolynomial<Specie, PolySize>>
-    (
-        new icoPolynomial<Specie, PolySize>(*this)
-    );
+    return autoPtr<icoPolynomial<Specie, PolySize>>::New(*this);
 }
 
 
@@ -68,10 +65,7 @@ template<class Specie, int PolySize>
 inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<icoPolynomial<Specie, PolySize>>
-    (
-        new icoPolynomial<Specie, PolySize>(dict)
-    );
+    return autoPtr<icoPolynomial<Specie, PolySize>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index d04880a6db..2d1b800522 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -55,10 +55,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
 Foam::incompressiblePerfectGas<Specie>::clone() const
 {
-    return autoPtr<incompressiblePerfectGas<Specie>>
-    (
-        new incompressiblePerfectGas<Specie>(*this)
-    );
+    return autoPtr<incompressiblePerfectGas<Specie>>::New(*this);
 }
 
 
@@ -69,10 +66,7 @@ Foam::incompressiblePerfectGas<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<incompressiblePerfectGas<Specie>>
-    (
-        new incompressiblePerfectGas<Specie>(dict)
-    );
+    return autoPtr<incompressiblePerfectGas<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
index c3d361d2dc..6ca2857ca7 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
@@ -60,7 +60,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::linear<Specie>>
 Foam::linear<Specie>::clone() const
 {
-    return autoPtr<linear<Specie>>(new linear<Specie>(*this));
+    return autoPtr<linear<Specie>>::New(*this);
 }
 
 
@@ -71,7 +71,7 @@ Foam::linear<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<linear<Specie>>(new linear<Specie>(dict));
+    return autoPtr<linear<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index a16c06c151..a6019b611a 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -61,7 +61,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::perfectFluid<Specie>>
 Foam::perfectFluid<Specie>::clone() const
 {
-    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(*this));
+    return autoPtr<perfectFluid<Specie>>::New(*this);
 }
 
 
@@ -72,7 +72,7 @@ Foam::perfectFluid<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(dict));
+    return autoPtr<perfectFluid<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index e3baad391a..263d2ecca2 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -54,7 +54,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::perfectGas<Specie>>
 Foam::perfectGas<Specie>::clone() const
 {
-    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(*this));
+    return autoPtr<perfectGas<Specie>>::New(*this);
 }
 
 
@@ -64,7 +64,7 @@ inline Foam::autoPtr<Foam::perfectGas<Specie>> Foam::perfectGas<Specie>::New
     const dictionary& dict
 )
 {
-    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(dict));
+    return autoPtr<perfectGas<Specie>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
index ee41587e8a..941e3fe86d 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
@@ -57,7 +57,7 @@ template<class Specie>
 inline Foam::autoPtr<Foam::rhoConst<Specie>>
 Foam::rhoConst<Specie>::clone() const
 {
-    return autoPtr<rhoConst<Specie>>(new rhoConst<Specie>(*this));
+    return autoPtr<rhoConst<Specie>>::New(*this);
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index 7b3b8ea571..521ef99879 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -212,10 +212,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<Reaction<ReactionThermo>> clone() const //
         {
-            return autoPtr<Reaction<ReactionThermo>>
-            (
-                new Reaction<ReactionThermo>(*this)
-            );
+            return autoPtr<Reaction<ReactionThermo>>::New(*this);
         }
 
         //- Construct and return a clone with new speciesTable
@@ -224,10 +221,7 @@ public:
             const speciesTable& species
         ) const
         {
-            return autoPtr<Reaction<ReactionThermo>>
-            (
-                new Reaction<ReactionThermo>(*this, species)
-            );
+            return autoPtr<Reaction<ReactionThermo>>::New(*this, species);
         }
 
 
@@ -243,8 +237,7 @@ public:
 
 
     //- Destructor
-    virtual ~Reaction()
-    {}
+    virtual ~Reaction() = default;
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index 4b5ba8005a..db097b2d64 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -58,10 +58,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<eConstThermo<EquationOfState>>
-    (
-        new eConstThermo<EquationOfState>(*this)
-    );
+    return autoPtr<eConstThermo<EquationOfState>>::New(*this);
 }
 
 
@@ -69,10 +66,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<eConstThermo<EquationOfState>>
-    (
-        new eConstThermo<EquationOfState>(dict)
-    );
+    return autoPtr<eConstThermo<EquationOfState>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index 09dcb98603..e86b3dd4d5 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -58,10 +58,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hConstThermo<EquationOfState>>
-    (
-        new hConstThermo<EquationOfState>(*this)
-    );
+    return autoPtr<hConstThermo<EquationOfState>>::New(*this);
 }
 
 
@@ -69,10 +66,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hConstThermo<EquationOfState>>
-    (
-        new hConstThermo<EquationOfState>(dict)
-    );
+    return autoPtr<hConstThermo<EquationOfState>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index 3f22215dbf..1b79b5582e 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -83,10 +83,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hPowerThermo<EquationOfState>>
-    (
-        new hPowerThermo<EquationOfState>(*this)
-    );
+    return autoPtr<hPowerThermo<EquationOfState>>::New(*this);
 }
 
 
@@ -94,10 +91,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hPowerThermo<EquationOfState>>
-    (
-        new hPowerThermo<EquationOfState>(dict)
-    );
+    return autoPtr<hPowerThermo<EquationOfState>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
index 575a648ddf..0074b7fa36 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -64,10 +64,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::clone() const
 {
-    return autoPtr<hRefConstThermo<EquationOfState>>
-    (
-        new hRefConstThermo<EquationOfState>(*this)
-    );
+    return autoPtr<hRefConstThermo<EquationOfState>>::New(*this);
 }
 
 
@@ -75,10 +72,7 @@ template<class EquationOfState>
 inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::New(const dictionary& dict)
 {
-    return autoPtr<hRefConstThermo<EquationOfState>>
-    (
-        new hRefConstThermo<EquationOfState>(dict)
-    );
+    return autoPtr<hRefConstThermo<EquationOfState>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index ab865dd9ab..0aecbc9687 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -56,10 +56,7 @@ template<class Thermo>
 inline Foam::autoPtr<Foam::constTransport<Thermo>>
 Foam::constTransport<Thermo>::clone() const
 {
-    return autoPtr<constTransport<Thermo>>
-    (
-        new constTransport<Thermo>(*this)
-    );
+    return autoPtr<constTransport<Thermo>>::New(*this);
 }
 
 
@@ -70,10 +67,7 @@ Foam::constTransport<Thermo>::New
     const dictionary& dict
 )
 {
-    return autoPtr<constTransport<Thermo>>
-    (
-        new constTransport<Thermo>(dict)
-    );
+    return autoPtr<constTransport<Thermo>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
index 558c41eb48..3a95c68bc4 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
@@ -58,10 +58,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize>>
 Foam::logPolynomialTransport<Thermo, PolySize>::clone() const
 {
-    return autoPtr<logPolynomialTransport<Thermo, PolySize>>
-    (
-        new logPolynomialTransport<Thermo, PolySize>(*this)
-    );
+    return autoPtr<logPolynomialTransport<Thermo, PolySize>>::New(*this);
 }
 
 
@@ -69,10 +66,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize>>
 Foam::logPolynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<logPolynomialTransport<Thermo, PolySize>>
-    (
-        new logPolynomialTransport<Thermo, PolySize>(dict)
-    );
+    return autoPtr<logPolynomialTransport<Thermo, PolySize>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index 6540d00ed4..6f6caaea45 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -58,10 +58,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::clone() const
 {
-    return autoPtr<polynomialTransport<Thermo, PolySize>>
-    (
-        new polynomialTransport<Thermo, PolySize>(*this)
-    );
+    return autoPtr<polynomialTransport<Thermo, PolySize>>::New(*this);
 }
 
 
@@ -69,10 +66,7 @@ template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
 {
-    return autoPtr<polynomialTransport<Thermo, PolySize>>
-    (
-        new polynomialTransport<Thermo, PolySize>(dict)
-    );
+    return autoPtr<polynomialTransport<Thermo, PolySize>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index e9a16c4ca1..2130365341 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -91,10 +91,7 @@ template<class Thermo>
 inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
 Foam::sutherlandTransport<Thermo>::clone() const
 {
-    return autoPtr<sutherlandTransport<Thermo>>
-    (
-        new sutherlandTransport<Thermo>(*this)
-    );
+    return autoPtr<sutherlandTransport<Thermo>>::New(*this);
 }
 
 
@@ -105,10 +102,7 @@ Foam::sutherlandTransport<Thermo>::New
     const dictionary& dict
 )
 {
-    return autoPtr<sutherlandTransport<Thermo>>
-    (
-        new sutherlandTransport<Thermo>(dict)
-    );
+    return autoPtr<sutherlandTransport<Thermo>>::New(dict);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
index a84320b96d..cff78c9676 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new Ar(*this));
+            return autoPtr<liquidProperties>::NewFrom<Ar>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
index 216acbf158..3938c90d26 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C10H22(*this));
+            return autoPtr<liquidProperties>::NewFrom<C10H22>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
index e50af5035f..f2214a0049 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C12H26(*this));
+            return autoPtr<liquidProperties>::NewFrom<C12H26>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
index c8ebfdfdb0..d250ca4ef1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C13H28(*this));
+            return autoPtr<liquidProperties>::NewFrom<C13H28>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
index 68351c2d41..74db926556 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C14H30(*this));
+            return autoPtr<liquidProperties>::NewFrom<C14H30>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
index a42139cc5a..aca1e87f9d 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C16H34(*this));
+            return autoPtr<liquidProperties>::NewFrom<C16H34>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
index 4d06bdb042..b97524a6ad 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C2H5OH(*this));
+            return autoPtr<liquidProperties>::NewFrom<C2H5OH>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
index 9f69f70298..b672b61834 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C2H6(*this));
+            return autoPtr<liquidProperties>::NewFrom<C2H6>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
index ec54cee6c3..dec9e8377a 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C2H6O(*this));
+            return autoPtr<liquidProperties>::NewFrom<C2H6O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
index f1f770a524..ae10112eb3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C3H6O(*this));
+            return autoPtr<liquidProperties>::NewFrom<C3H6O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
index 950b6e6085..682cf3d523 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C3H8(*this));
+            return autoPtr<liquidProperties>::NewFrom<C3H8>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
index 1049d3692f..b9983114f5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C4H10O(*this));
+            return autoPtr<liquidProperties>::NewFrom<C4H10O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
index da6301802f..bceb8ca29c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C6H14(*this));
+            return autoPtr<liquidProperties>::NewFrom<C6H14>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
index da7a6f32be..c326757d7f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C6H6(*this));
+            return autoPtr<liquidProperties>::NewFrom<C6H6>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
index c30a0d4cdc..62937c2f02 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C7H16(*this));
+            return autoPtr<liquidProperties>::NewFrom<C7H16>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
index 16bbb8364a..d8a42d6c87 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C7H8(*this));
+            return autoPtr<liquidProperties>::NewFrom<C7H8>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
index 856071437e..2f89af9431 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
@@ -114,7 +114,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C8H10(*this));
+            return autoPtr<liquidProperties>::NewFrom<C8H10>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
index caf1ad885a..7406070e3b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C8H18(*this));
+            return autoPtr<liquidProperties>::NewFrom<C8H18>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
index 72d2d6f937..05e0bd83e3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new C9H20(*this));
+            return autoPtr<liquidProperties>::NewFrom<C9H20>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
index 0d359ed831..ccca8a2a87 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new CH3OH(*this));
+            return autoPtr<liquidProperties>::NewFrom<CH3OH>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
index 2e8be163ac..ad71f9ec8c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new CH4N2O(*this));
+            return autoPtr<liquidProperties>::NewFrom<CH4N2O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
index dfa48fd32c..5387de6478 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
@@ -114,7 +114,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new H2O(*this));
+            return autoPtr<liquidProperties>::NewFrom<H2O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
index 9be7f5885c..71ee57d793 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new IC8H18(*this));
+            return autoPtr<liquidProperties>::NewFrom<IC8H18>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
index dccf97c4fc..361cf3f1e1 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
@@ -137,7 +137,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new IDEA(*this));
+            return autoPtr<liquidProperties>::NewFrom<IDEA>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
index 9b0c7fd430..6ace085030 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new MB(*this));
+            return autoPtr<liquidProperties>::NewFrom<MB>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
index db637e421f..6e374c6913 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new N2(*this));
+            return autoPtr<liquidProperties>::NewFrom<N2>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 370609e2f6..c32964009b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new aC10H7CH3(*this));
+            return autoPtr<liquidProperties>::NewFrom<aC10H7CH3>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 07e700773d..4d705c7a55 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -115,7 +115,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new bC10H7CH3(*this));
+            return autoPtr<liquidProperties>::NewFrom<bC10H7CH3>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
index 4f616f79d3..f85c27b747 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
@@ -113,7 +113,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new iC3H8O(*this));
+            return autoPtr<liquidProperties>::NewFrom<iC3H8O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
index c07e51462f..1dd2c6212c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -90,10 +90,7 @@ Foam::liquidMixtureProperties::New
     const dictionary& thermophysicalProperties
 )
 {
-    return autoPtr<liquidMixtureProperties>
-    (
-        new liquidMixtureProperties(thermophysicalProperties)
-    );
+    return autoPtr<liquidMixtureProperties>::New(thermophysicalProperties);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
index d726a93dce..c0530ba2d0 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
@@ -91,16 +91,12 @@ public:
         //- Construct and return a clone
         virtual autoPtr<liquidMixtureProperties> clone() const
         {
-            return autoPtr<liquidMixtureProperties>
-            (
-                new liquidMixtureProperties(*this)
-            );
+            return autoPtr<liquidMixtureProperties>::New(*this);
         }
 
 
     //- Destructor
-    virtual ~liquidMixtureProperties()
-    {}
+    virtual ~liquidMixtureProperties() = default;
 
 
     // Selectors
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
index e0dec535cf..aa14a2c91f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
@@ -154,22 +154,20 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
             );
         }
     }
-    else
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(liquidType);
+
+    if (!cstrIter.found())
     {
-        auto cstrIter = dictionaryConstructorTablePtr_->cfind(liquidType);
-
-        if (!cstrIter.found())
-        {
-            FatalErrorInFunction
-                << "Unknown liquidProperties type "
-                << liquidType << nl << nl
-                << "Valid liquidProperties types :" << nl
-                << dictionaryConstructorTablePtr_->sortedToc()
-                << exit(FatalError);
-        }
-
-        return autoPtr<liquidProperties>(cstrIter()(dict));
+        FatalErrorInFunction
+            << "Unknown liquidProperties type "
+            << liquidType << nl << nl
+            << "Valid liquidProperties types :" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
+
+    return autoPtr<liquidProperties>(cstrIter()(dict));
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
index 578e57bb22..e7559e0e8c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
@@ -113,7 +113,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
-            return autoPtr<liquidProperties>(new nC3H8O(*this));
+            return autoPtr<liquidProperties>::NewFrom<nC3H8O>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H
index 7937e75ae9..07b2ab2c00 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H
@@ -68,7 +68,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
-            return autoPtr<solidProperties>(new C(*this));
+            return autoPtr<solidProperties>::NewFrom<C>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H
index 1ffb1f6b19..8f5868849b 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H
@@ -68,7 +68,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
-            return autoPtr<solidProperties>(new CaCO3(*this));
+            return autoPtr<solidProperties>::NewFrom<CaCO3>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H
index b80c0385a1..5df0df767f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H
@@ -68,7 +68,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
-            return autoPtr<solidProperties>(new ash(*this));
+            return autoPtr<solidProperties>::NewFrom<ash>(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
index 18fa9faa73..17b3dc4b51 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -79,10 +79,7 @@ Foam::autoPtr<Foam::solidMixtureProperties> Foam::solidMixtureProperties::New
     const dictionary& thermophysicalProperties
 )
 {
-    return autoPtr<solidMixtureProperties>
-    (
-        new solidMixtureProperties(thermophysicalProperties)
-    );
+    return autoPtr<solidMixtureProperties>::New(thermophysicalProperties);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
index a9cdfa732c..8089ae2df9 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
@@ -89,16 +89,12 @@ public:
         //- Construct and return a clone
         virtual autoPtr<solidMixtureProperties> clone() const
         {
-            return autoPtr<solidMixtureProperties>
-            (
-                new solidMixtureProperties(*this)
-            );
+            return autoPtr<solidMixtureProperties>::New(*this);
         }
 
 
     //- Destructor
-    virtual ~solidMixtureProperties()
-    {}
+    virtual ~solidMixtureProperties() = default;
 
 
     // Selectors
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
index dce26f383e..7f9b957764 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
@@ -114,7 +114,7 @@ public:
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
-            return autoPtr<solidProperties>(new solidProperties(*this));
+            return autoPtr<solidProperties>::New(*this);
         }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
index 89c4de9b2e..6f25fc40e5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -74,30 +74,26 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
         {
             return New(solidType);
         }
-        else
-        {
-            return autoPtr<solidProperties>
-            (
-                new solidProperties(dict.optionalSubDict(solidType + "Coeffs"))
-            );
-        }
+
+        return autoPtr<solidProperties>::New
+        (
+            dict.optionalSubDict(solidType + "Coeffs")
+        );
     }
-    else
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(solidType);
+
+    if (!cstrIter.found())
     {
-        auto cstrIter = dictionaryConstructorTablePtr_->cfind(solidType);
-
-        if (!cstrIter.found())
-        {
-            FatalErrorInFunction
-                << "Unknown solidProperties type "
-                << solidType << nl << nl
-                << "Valid solidProperties types :" << nl
-                << dictionaryConstructorTablePtr_->sortedToc()
-                << exit(FatalError);
-        }
-
-        return autoPtr<solidProperties>(cstrIter()(dict));
+        FatalErrorInFunction
+            << "Unknown solidProperties type "
+            << solidType << nl << nl
+            << "Valid solidProperties types :" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
+
+    return autoPtr<solidProperties>(cstrIter()(dict));
 }
 
 
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
index 7abdb1a75d..e48c64445e 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
@@ -56,13 +56,11 @@ Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
 
         return cstrIter()(sigmaDict, mesh);
     }
-    else
-    {
-        return autoPtr<surfaceTensionModel>
-        (
-            new surfaceTensionModels::constant(dict, mesh)
-        );
-    }
+
+    return autoPtr<surfaceTensionModel>
+    (
+        new surfaceTensionModels::constant(dict, mesh)
+    );
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index 4594202d38..c030375845 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -103,7 +103,7 @@ Foam::constantAlphaContactAngleFvPatchScalarField::theta
     const fvsPatchVectorField&
 ) const
 {
-    return tmp<scalarField>(new scalarField(size(), theta0_));
+    return tmp<scalarField>::New(size(), theta0_);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index e488fcd9eb..13301320b3 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -120,7 +120,7 @@ Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
 {
     if (uTheta_ < SMALL)
     {
-        return tmp<scalarField>(new scalarField(size(), theta0_));
+        return tmp<scalarField>::New(size(), theta0_);
     }
 
     const vectorField nf(patch().nf());
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index 3ed663eb68..b02dc17c4b 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -121,7 +121,7 @@ Foam::timeVaryingAlphaContactAngleFvPatchScalarField::theta
         theta0 = thetaT0_ + (t - t0_)*(thetaTe_ - thetaT0_)/(te_ - t0_);
     }
 
-    return tmp<scalarField>(new scalarField(size(), theta0));
+    return tmp<scalarField>::New(size(), theta0);
 }
 
 

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 12/13] 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;
         }
     }

From 664685f7fe33b9096ed4b65e6d9ddf3681a22822 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 5 Mar 2018 20:18:26 +0100
Subject: [PATCH 13/13] CONFIG: bump API version number to 1803 to account for
 removal of Xfer

- primary points for an external user are the polyMesh constructor

- add config info for gcc-7.3.0

COMP: intel-2017. Ignore unknown pragmas. Disambiguate method resolution.
---
 etc/bashrc                                                     | 2 +-
 etc/config.csh/compiler                                        | 3 +++
 etc/config.sh/compiler                                         | 3 +++
 etc/cshrc                                                      | 2 +-
 .../singleStepCombustion/singleStepCombustion.C                | 2 +-
 wmake/rules/General/general                                    | 2 +-
 wmake/rules/linux64Icc/c++                                     | 2 +-
 wmake/rules/linux64IccKNL/c++                                  | 2 +-
 wmake/rules/linuxIA64Icc/c++                                   | 2 +-
 wmake/rules/linuxIcc/c++                                       | 2 +-
 10 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index f8d87bd4eb..da0db18ec0 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -60,7 +60,7 @@ unset rc
 export WM_COMPILER_TYPE=system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
 export WM_COMPILER=Gcc
 
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index 4a79683adf..3364100974 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -66,6 +66,9 @@ case ThirdParty:
     case Gcc72:
         set gcc_version=gcc-7.2.0
         breaksw
+    case Gcc73:
+        set gcc_version=gcc-7.3.0
+        breaksw
     case Clang:
         set clang_version=llvm-3.7.1
         breaksw
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 27103df82b..a7a9df369c 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -65,6 +65,9 @@ ThirdParty)
     Gcc72)
         gcc_version=gcc-7.2.0
         ;;
+    Gcc73)
+        gcc_version=gcc-7.3.0
+        ;;
     Clang)
         clang_version=llvm-3.7.1
         ;;
diff --git a/etc/cshrc b/etc/cshrc
index 8545e9f098..350b71ef1b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,7 +57,7 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
 setenv WM_COMPILER_TYPE system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
 setenv WM_COMPILER Gcc
 
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index 668a3c0726..f65cefb80e 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -116,7 +116,7 @@ tmp<fvScalarMatrix> singleStepCombustion<CombThermoType, ThermoType>::R
         const volScalarField fres(singleMixturePtr_->fres(specieI));
         wSpecie /= max(fNorm*(Y - fres), scalar(1e-2));
 
-        return -fNorm*wSpecie*fres + fNorm*fvm::Sp(wSpecie, Y);
+        return -fNorm*wSpecie*fres + scalar(fNorm)*fvm::Sp(wSpecie, Y);
     }
     else
     {
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 3ab6290fc9..13e216c5dc 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM_PLUS=1712
+WM_VERSION = OPENFOAM_PLUS=1803
 
 AR         = ar
 ARFLAGS    = cr
diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++
index c03b08671a..e40c331342 100644
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@@ -1,6 +1,6 @@
 SUFFIXES += .C .cc .cpp .cxx
 
-c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
+c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
               -diag-disable 327,654,1125,1292,2289,2304,11062,11074,11076
 
 # Suppress some warnings for flex++ and CGAL
diff --git a/wmake/rules/linux64IccKNL/c++ b/wmake/rules/linux64IccKNL/c++
index 9b047d22ca..4196ede55e 100644
--- a/wmake/rules/linux64IccKNL/c++
+++ b/wmake/rules/linux64IccKNL/c++
@@ -1,6 +1,6 @@
 SUFFIXES += .C .cc .cpp .cxx
 
-c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
+c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
               -diag-disable 654,1125,1292,2304
 
 # Suppress some warnings for flex++ and CGAL
diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++
index 021f97c527..cf9d7524d2 100644
--- a/wmake/rules/linuxIA64Icc/c++
+++ b/wmake/rules/linuxIA64Icc/c++
@@ -1,6 +1,6 @@
 SUFFIXES += .C .cc .cpp .cxx
 
-c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
+c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
               -diag-disable 2304,1292
 
 # Suppress some warnings for flex++ and CGAL
diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++
index 7c5c4d5e5b..1cbe27f9ef 100644
--- a/wmake/rules/linuxIcc/c++
+++ b/wmake/rules/linuxIcc/c++
@@ -1,6 +1,6 @@
 SUFFIXES += .C .cc .cpp .cxx
 
-c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
+c++WARN     = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
               -diag-disable 327,654,1125,1292,2289,2304,11062,11074,11076
 
 # Suppress some warnings for flex++ and CGAL