diff --git a/applications/test/DLList/Test-DLList.C b/applications/test/DLList/Test-DLList.C
index d370348982..8e653c4b20 100644
--- a/applications/test/DLList/Test-DLList.C
+++ b/applications/test/DLList/Test-DLList.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) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,6 +41,8 @@ int main(int argc, char *argv[])
 {
     DLList<scalar> myList;
 
+    Info<< "DLList<scalar>" << nl;
+
     for (int i = 0; i<10; i++)
     {
         myList.append(1.3*i);
@@ -49,9 +51,7 @@ int main(int argc, char *argv[])
     myList.append(100.3);
     myList.append(500.3);
 
-    Info<< nl << "And again using STL iterator: " << nl << endl;
-
-    forAllIter(DLList<scalar>, myList, iter)
+    forAllConstIters(myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using the same STL iterator: " << nl << endl;
 
-    forAllIter(DLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "Removing " << myList.remove(iter) << endl;
     }
@@ -68,13 +68,10 @@ int main(int argc, char *argv[])
     myList.append(200.3);
     myList.append(100.3);
 
-
-    Info<< nl << "And again using STL const_iterator: " << nl << endl;
-
-
-    forAllConstIter(DLList<scalar>, myList, iter)
+    Info<< nl << "Using range-based for: " << nl << endl;
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "Testing swapUp and swapDown: " << endl;
@@ -84,9 +81,9 @@ int main(int argc, char *argv[])
     myList.swapUp(myList.DLListBase::first());
     myList.swapUp(myList.DLListBase::last());
 
-    forAllIter(DLList<scalar>, myList, iter)
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "swapDown" << endl;
@@ -94,12 +91,11 @@ int main(int argc, char *argv[])
     myList.swapDown(myList.DLListBase::first());
     myList.swapDown(myList.DLListBase::last());
 
-    forAllIter(DLList<scalar>, myList, iter)
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
-
     Info<< nl << "Testing transfer: " << nl << nl
         << "original: " << myList << endl;
 
diff --git a/applications/test/Dictionary/Test-Dictionary.C b/applications/test/Dictionary/Test-Dictionary.C
index f48845a36f..251cb2f841 100644
--- a/applications/test/Dictionary/Test-Dictionary.C
+++ b/applications/test/Dictionary/Test-Dictionary.C
@@ -168,9 +168,24 @@ int main(int argc, char *argv[])
     Info<< nl << "scalarDict2: " << endl;
     forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
     {
+        std::cout<< "iter: " << typeid(*iter).name() << '\n';
+
         Info<< "elem = " << *iter << endl;
     }
 
+    // FIXME: the deduction seems to be different here.
+    // - returns pointer (as perhaps actually expected) not the
+    //  underlying value.
+    forAllConstIters(scalarDict2, iter)
+    {
+        std::cout<< "iter: " << typeid(*iter).name() << '\n';
+
+        Info<< "elem = " << *(*iter) << endl;
+    }
+
+    std::cout<< "iter type: "
+        << typeid(stdFoam::begin(scalarDict2)).name() << '\n';
+
     scalarDict.transfer(scalarDict2);
 
 
diff --git a/applications/test/HashTable/Test-hashTable.C b/applications/test/HashTable/Test-hashTable.C
index dc2f70658e..391a5ee618 100644
--- a/applications/test/HashTable/Test-hashTable.C
+++ b/applications/test/HashTable/Test-hashTable.C
@@ -62,7 +62,7 @@ int main()
     Info<< "\ntable1 sortedToc: " << table1.sortedToc() << endl;
     table1.printInfo(Info)
         << "table1 [" << table1.size() << "] " << endl;
-    forAllConstIter(HashTable<scalar>, table1, iter)
+    forAllConstIters(table1, iter)
     {
         Info<< iter.key() << " => " << iter() << nl;
     }
@@ -106,7 +106,7 @@ int main()
         << "\ntable3" << table3 << nl;
 
     Info<< "\nerase table2 by iterator" << nl;
-    forAllIter(HashTable<scalar>, table2, iter)
+    forAllIters(table2, iter)
     {
         Info<< "erasing " << iter.key() << " => " << iter.object() << " ... ";
         table2.erase(iter);
diff --git a/applications/test/ISLList/Test-ISLList.C b/applications/test/ISLList/Test-ISLList.C
index ef4fd6614d..38ba2a1424 100644
--- a/applications/test/ISLList/Test-ISLList.C
+++ b/applications/test/ISLList/Test-ISLList.C
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    forAllIter(SLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
 
     const ISLList<Scalar>& const_myList = myList;
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    forAllConstIters(const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
diff --git a/applications/test/NamedEnum/Test-NamedEnum.C b/applications/test/NamedEnum/Test-NamedEnum.C
index 63386ed79e..08d1f74972 100644
--- a/applications/test/NamedEnum/Test-NamedEnum.C
+++ b/applications/test/NamedEnum/Test-NamedEnum.C
@@ -77,24 +77,12 @@ int main(int argc, char *argv[])
             << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
     }
 
-#if __cplusplus > 201100L
-    // C++11
     Info<< "loop over enums (C++11 for range):" << nl;
-    for (auto const& opt : options)
+    for (const auto& opt : options)
     {
         Info<< "option[" << opt
             << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
     }
-#else
-    Info<< "loop over enums (via iterator):" << nl;
-    forAllConstIter(List<namedEnumTest::option>, options, iter)
-    {
-        const namedEnumTest::option& opt = *iter;
-
-        Info<< "option[" << opt
-            << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
-    }
-#endif
 
     Info<< nl
         << namedEnumTest::namedEnum["a"] << nl
diff --git a/applications/test/SLList/Test-SLList.C b/applications/test/SLList/Test-SLList.C
index 30baaa18e3..d46fbf6e8e 100644
--- a/applications/test/SLList/Test-SLList.C
+++ b/applications/test/SLList/Test-SLList.C
@@ -52,29 +52,29 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    forAllIter(SLList<scalar>, myList, iter)
+    for (auto const& val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "And again using STL const_iterator: " << nl << endl;
 
     const SLList<scalar>& const_myList = myList;
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    forAllConstIters(const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
 
-    forAllIter(SLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "Removing element:" << *iter << endl;
         myList.remove(iter);
     }
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    for (auto const& val : const_myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
 
diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index dec03a06f0..a85d2a14dc 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -28,10 +28,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "IOobject.H"
-#include "IOstreams.H"
-#include "IFstream.H"
-#include "IStringStream.H"
 #include "labelRanges.H"
 
 using namespace Foam;
@@ -42,6 +38,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.insert("start size .. startN sizeN");
     argList::addOption("verbose");
     argList::addNote
@@ -76,12 +73,9 @@ int main(int argc, char *argv[])
         }
 
         {
-            label start = 0;
-            label size  = 0;
-
-            IStringStream(args[argI])() >> start;
+            label start = args.argRead<label>(argI);
+            label size  = args.argRead<label>(argI+1);
             ++argI;
-            IStringStream(args[argI])() >> size;
 
             range.reset(start, size);
         }
@@ -90,9 +84,9 @@ int main(int argc, char *argv[])
         if (removeMode)
         {
             Info<< "del " << range << " :";
-            forAllConstIter(labelRange, range, iter)
+            for (auto i : range)
             {
-                Info<< " " << iter();
+                Info<< " " << i;
             }
             Info<< nl;
 
@@ -101,9 +95,9 @@ int main(int argc, char *argv[])
         else
         {
             Info<< "add " << range  << " :";
-            forAllConstIter(labelRange, range, iter)
+            for (auto i : range)
             {
-                Info<< " " << iter();
+                Info<< " " << i;
             }
             Info<< nl;
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 362a15ccbc..4b81951562 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -47,6 +47,7 @@ SourceFiles
 #include "uLabel.H"
 #include "nullObject.H"
 #include "zero.H"
+#include "stdFoam.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -427,69 +428,6 @@ inline void reverse(UList<T>& ul);
 
 #include "UListI.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Loop across all elements in \a list
-// \par Usage
-// \code
-// forAll(anyList, i)
-// {
-//      statements;
-// }
-// \endcode
-// \sa forAllReverse
-#define forAll(list, i) \
-    for (Foam::label i=0; i<(list).size(); ++i)
-
-//- Reverse loop across all elements in \a list
-//  \par Usage
-//  \code
-//  forAllReverse(anyList, i)
-//  {
-//       statements;
-//  }
-//  \endcode
-//  \sa forAll
-#define forAllReverse(list, i) \
-    for (Foam::label i=(list).size()-1; i>=0; --i)
-
-//- Iterate across all elements in the \a container object of type
-//  \a Container.
-//  \par Usage
-//  \code
-//  forAll(ContainerType, container, iter)
-//  {
-//      statements;
-//  }
-//  \endcode
-//  \sa forAllConstIter
-#define forAllIter(Container,container,iter)                                   \
-    for                                                                        \
-    (                                                                          \
-        Container::iterator iter = (container).begin();                        \
-        iter != (container).end();                                             \
-        ++iter                                                                 \
-    )
-
-//- Iterate across all elements in the \a container object of type
-//  \a Container with const access.
-//  \par Usage
-//  \code
-//  forAllConstIter(ContainerType, container, iter)
-//  {
-//      statements;
-//  }
-//  \endcode
-//  \sa forAllIter
-#define forAllConstIter(Container,container,iter)                              \
-    for                                                                        \
-    (                                                                          \
-        Container::const_iterator iter = (container).cbegin();                 \
-        iter != (container).cend();                                            \
-        ++iter                                                                 \
-    )
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H
new file mode 100644
index 0000000000..59b0d9f704
--- /dev/null
+++ b/src/OpenFOAM/include/stdFoam.H
@@ -0,0 +1,212 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 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/>.
+
+Namespace
+    stdFoam
+
+Description
+    Includes some global templates and macros used by OpenFOAM.
+
+    Some of the templates are defined here correspond to useful
+    std templates that are part of future C++ standards, or that
+    are in a state of change. Defining them here provides some additional
+    control over which definition are used within the OpenFOAM code-base.
+
+SeeAlso
+    - http://en.cppreference.com/w/cpp/iterator/end
+    - http://en.cppreference.com/w/cpp/iterator/begin
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef StdFoam_H
+#define StdFoam_H
+
+#include <initializer_list>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace stdFoam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return iterator to the beginning of the container \a c or array.
+//  Definition as per std::begin C++17
+template<class C>
+constexpr auto begin(C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return const_iterator to the beginning of the container \a c or array.
+//  Definition as per std::begin C++17
+template<class C>
+constexpr auto begin(const C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return const_iterator to the beginning of the container \a c or array.
+//  Definition as per std::cbegin C++17
+template<class C>
+constexpr auto cbegin(const C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return iterator to the end of the container \a c or array.
+//  Definition as per std::end C++17
+template<class C>
+constexpr auto end(C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+//- Return const_iterator to the end of the container \a c or array.
+//  Definition as per std::end C++17
+template<class C>
+constexpr auto end(const C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+//- Return const_iterator to the end of the container \a c or array.
+//  Definition as per std::cend C++17
+template<class C>
+constexpr auto cend(const C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+
+} // End namespace stdFoam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Iterate across all elements in the \a container object of type
+//  \a Container.
+//  \par Usage
+//  \code
+//  forAllIters(container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllConstIters, forAllIter, forAllConstIters
+#define forAllIters(container,it)                                              \
+    for                                                                        \
+    (                                                                          \
+        auto it = stdFoam::begin(container);                                   \
+        it != stdFoam::end(container);                                         \
+        ++it                                                                   \
+    )
+
+
+//- Iterate across all elements of the \a container object with const access.
+//  \par Usage
+//  \code
+//  forAllConstIters(container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllIters, forAllIter, forAllConstIter
+#define forAllConstIters(container,cit)                                        \
+    for                                                                        \
+    (                                                                          \
+        auto cit = stdFoam::cbegin(container);                                 \
+        cit != stdFoam::cend(container);                                       \
+        ++cit                                                                  \
+    )
+
+
+//- Loop across all elements in \a list
+// \par Usage
+// \code
+// forAll(anyList, i)
+// {
+//      statements;
+// }
+// \endcode
+// \sa forAllReverse
+#define forAll(list, i) \
+    for (Foam::label i=0; i<(list).size(); ++i)
+
+
+//- Reverse loop across all elements in \a list
+//  \par Usage
+//  \code
+//  forAllReverse(anyList, i)
+//  {
+//       statements;
+//  }
+//  \endcode
+//  \sa forAll
+#define forAllReverse(list, i) \
+    for (Foam::label i=(list).size()-1; i>=0; --i)
+
+
+//- Iterate across all elements in the \a container object
+//  of type \a Container.
+//  \par Usage
+//  \code
+//  forAllIter(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllConstIter
+#define forAllIter(Container,container,iter)                                   \
+    for                                                                        \
+    (                                                                          \
+        Container::iterator iter = (container).begin();                        \
+        iter != (container).end();                                             \
+        ++iter                                                                 \
+    )
+
+
+//- Iterate across all elements in the \a container object
+//  of type \a Container with const access.
+//  \par Usage
+//  \code
+//  forAllConstIter(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllIter
+#define forAllConstIter(Container,container,iter)                              \
+    for                                                                        \
+    (                                                                          \
+        Container::const_iterator iter = (container).cbegin();                 \
+        iter != (container).cend();                                            \
+        ++iter                                                                 \
+    )
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //