diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 3c8bff42..ef6c98c0 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -244,7 +244,8 @@ public:
 
             //- Deprecated(2019-01) Pointing at a valid storage node
             //  \deprecated(2019-01) - use good() method
-            bool FOAM_DEPRECATED_FOR(2019-01, "good() method") found() const
+            FOAM_DEPRECATED_FOR(2019-01, "good() method")
+            bool found() const
             {
                 return this->good();
             }
@@ -297,7 +298,8 @@ public:
 
             //- Deprecated(2019-01) Pointing at a valid storage node
             //  \deprecated(2019-01) - use good() method
-            bool FOAM_DEPRECATED_FOR(2019-01, "good() method") found() const
+            FOAM_DEPRECATED_FOR(2019-01, "good() method")
+            bool found() const
             {
                 return this->good();
             }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index ccc7c9ab..bd58fadd 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -220,7 +220,8 @@ public:
 
             //- Deprecated(2019-01) Pointing at a valid storage node
             //  \deprecated(2019-01) - use good() method
-            bool FOAM_DEPRECATED_FOR(2019-01, "good() method") found() const
+            FOAM_DEPRECATED_FOR(2019-01, "good() method")
+            bool found() const
             {
                 return this->good();
             }
@@ -271,7 +272,8 @@ public:
 
             //- Deprecated(2019-01) Pointing at a valid storage node
             //  \deprecated(2019-01) - use good() method
-            bool FOAM_DEPRECATED_FOR(2019-01, "good() method") found() const
+            FOAM_DEPRECATED_FOR(2019-01, "good() method")
+            bool found() const
             {
                 return this->good();
             }
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 4060e090..67ca8066 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -401,7 +401,8 @@ List<OutputIntListType> invertManyToMany
 //  \return The index found or return -1 if not found.
 //  \deprecated(2017-10) - use the UList find/found methods
 template<class ListType>
-label FOAM_DEPRECATED(2017-10) findIndex
+FOAM_DEPRECATED(2017-10)
+label findIndex
 (
     const ListType& input,
     typename ListType::const_reference val,
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 9f201e70..e102648c 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -1288,8 +1288,8 @@ public:
         //- Deprecated(2018-07) find and return an entry data stream
         //
         //  \deprecated(2018-07) - use lookup() method
-        ITstream& FOAM_DEPRECATED_FOR(2018-07, "lookup() method")
-        operator[](const word& keyword) const
+        FOAM_DEPRECATED_FOR(2018-07, "lookup() method")
+        ITstream& operator[](const word& keyword) const
         {
             return lookup(keyword);
         }
@@ -1297,8 +1297,8 @@ public:
         //- Deprecated(2018-10) find and return a T.
         //  \deprecated(2018-10) - use get() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-10, "get() method")
-        lookupType
+        FOAM_DEPRECATED_FOR(2018-10, "get() method")
+        T lookupType
         (
             const word& keyword,
             bool recursive = false,
@@ -1310,8 +1310,8 @@ public:
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        bool FOAM_DEPRECATED_FOR(2018-10, "found(keyType::option)")
-        found
+        FOAM_DEPRECATED_FOR(2018-10, "found(keyType::option)")
+        bool found
         (
             const word& keyword,
             bool recursive,
@@ -1323,9 +1323,8 @@ public:
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        entry*
         FOAM_DEPRECATED_FOR(2018-10, "findEntry(keyType::option)")
-        lookupEntryPtr
+        entry* lookupEntryPtr
         (
             const word& keyword,
             bool recursive,
@@ -1337,9 +1336,8 @@ public:
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        const entry*
         FOAM_DEPRECATED_FOR(2018-10, "findEntry(keyType::option)")
-        lookupEntryPtr
+        const entry* lookupEntryPtr
         (
             const word& keyword,
             bool recursive,
@@ -1351,9 +1349,8 @@ public:
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        const entry*
         FOAM_DEPRECATED_FOR(2018-10, "findScoped(keyType::option)")
-        lookupScopedEntryPtr
+        const entry* lookupScopedEntryPtr
         (
             const word& keyword,
             bool recursive,
@@ -1369,9 +1366,8 @@ public:
         //
         //  Search type: non-recursive with patterns.
         //  \deprecated(2018-10) - use findDict() method
-        const dictionary*
         FOAM_DEPRECATED_FOR(2018-10, "findDict() method")
-        subDictPtr(const word& keyword) const
+        const dictionary* subDictPtr(const word& keyword) const
         {
             return findDict(keyword, keyType::REGEX);
         }
@@ -1382,18 +1378,16 @@ public:
         //
         //  Search type: non-recursive with patterns.
         //  \deprecated(2018-10) - use findDict() method
-        dictionary*
         FOAM_DEPRECATED_FOR(2018-10, "findDict() method")
-        subDictPtr(const word& keyword)
+        dictionary* subDictPtr(const word& keyword)
         {
             return findDict(keyword, keyType::REGEX);
         }
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        const entry&
         FOAM_DEPRECATED_FOR(2018-10, "lookupEntry(keyType::option)")
-        lookupEntry
+        const entry& lookupEntry
         (
             const word& keyword,
             bool recursive,
@@ -1405,9 +1399,8 @@ public:
 
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
-        ITstream&
         FOAM_DEPRECATED_FOR(2018-10, "lookup(keyType::option)")
-        lookup
+        ITstream& lookup
         (
             const word& keyword,
             bool recursive,
@@ -1420,8 +1413,8 @@ public:
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-10, "lookupOrDefault(keyType::option)")
-        lookupOrDefault
+        FOAM_DEPRECATED_FOR(2018-10, "lookupOrDefault(keyType::option)")
+        T lookupOrDefault
         (
             const word& keyword,
             const T& deflt,
@@ -1437,8 +1430,8 @@ public:
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-10, "lookupOrAddDefault(keyType::option)")
-        lookupOrAddDefault
+        FOAM_DEPRECATED_FOR(2018-10, "lookupOrAddDefault(keyType::option)")
+        T lookupOrAddDefault
         (
             const word& keyword,
             const T& deflt,
@@ -1454,9 +1447,8 @@ public:
         //- Deprecated(2018-10)
         //  \deprecated(2018-10) - use keyType::option version
         template<class T>
-        bool
         FOAM_DEPRECATED_FOR(2018-10, "readIfPresent(keyType::option)")
-        readIfPresent
+        bool readIfPresent
         (
             const word& keyword,
             T& val,
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 823c2557..a43270cd 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -371,16 +371,14 @@ public:
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        explicit dimensioned(Istream& is)
-        FOAM_DEPRECATED(2018-11);
+        FOAM_DEPRECATED(2018-11) explicit dimensioned(Istream& is);
 
         //- Deprecated(2018-11) Construct from Istream with given name
         //- (expects dimensions, value)
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        dimensioned(const word& name, Istream& is)
-        FOAM_DEPRECATED(2018-11);
+        FOAM_DEPRECATED(2018-11) dimensioned(const word& name, Istream& is);
 
         //- Deprecated(2018-11) Construct from Istream with given name
         //- and expected dimensions.
@@ -390,8 +388,7 @@ public:
         //  \deprecated(2018-11) - should generally use construct from
         //      dictionary or primitiveEntry instead
         //      (additional checks on the input stream).
-        dimensioned(const word& name, const dimensionSet& dims, Istream& is)
-        FOAM_DEPRECATED(2018-11);
+        FOAM_DEPRECATED(2018-11) dimensioned(const word& name, const dimensionSet& dims, Istream& is);
 
 
         //- Construct dimensioned from dictionary, with default value.
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 21891cbc..3204a4bd 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -698,11 +698,12 @@ public:
 
         //- Deprecated(2019-01) identical to clip()
         //  \deprecated(2019-01) identical to clip()
+        FOAM_DEPRECATED_FOR(2019-01, "clip() method")
         void maxMin
         (
             const dimensioned<Type>& minVal,
             const dimensioned<Type>& maxVal
-        ) FOAM_DEPRECATED_FOR(2019-01, "clip() method");
+        );
 
 
     // Member Operators
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 407315f0..c2a3440d 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -628,8 +628,8 @@ public:
         //  Index 1 is the first (non-option) argument.
         //  \deprecated(2018-08) - use get() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-08, "get() method")
-        read(const label index) const
+        FOAM_DEPRECATED_FOR(2018-08, "get() method")
+        T read(const label index) const
         {
             return this->get<T>(index);
         }
@@ -638,24 +638,24 @@ public:
         //  Index 1 is the first (non-option) argument.
         //  \deprecated(2018-01) - use get() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-01, "get() method")
-        argRead(const label index) const
+        FOAM_DEPRECATED_FOR(2018-01, "get() method")
+        T argRead(const label index) const
         {
             return this->get<T>(index);
         }
 
         //- Deprecated(2018-01) return true if the named option is found
         //  \deprecated(2018-01) - use found() method
-        bool FOAM_DEPRECATED_FOR(2018-01, "found() method")
-        optionFound(const word& optName) const
+        FOAM_DEPRECATED_FOR(2018-01, "found() method")
+        bool optionFound(const word& optName) const
         {
             return found(optName);
         }
 
         //- Deprecated(2018-01) return an input stream from the named option
         //  \deprecated(2018-01) - use lookup() method
-        ITstream FOAM_DEPRECATED_FOR(2018-01, "lookup() method")
-        optionLookup(const word& optName) const
+        FOAM_DEPRECATED_FOR(2018-01, "lookup() method")
+        ITstream optionLookup(const word& optName) const
         {
             return lookup(optName);
         }
@@ -663,8 +663,8 @@ public:
         //- Deprecated(2018-01) read a value from the named option
         //  \deprecated(2018-01) - use get() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-01, "get() method")
-        optionRead(const word& optName) const
+        FOAM_DEPRECATED_FOR(2018-01, "get() method")
+        T optionRead(const word& optName) const
         {
             return get<T>(optName);
         }
@@ -673,8 +673,8 @@ public:
         //  Return true if the named option was found.
         //  \deprecated(2018-01) - use readIfPresent() method
         template<class T>
-        bool FOAM_DEPRECATED_FOR(2018-01, "readIfPresent() method")
-        optionReadIfPresent
+        FOAM_DEPRECATED_FOR(2018-01, "readIfPresent() method")
+        bool optionReadIfPresent
         (
             const word& optName,
             T& val
@@ -688,8 +688,8 @@ public:
         //  use the supplied default and return false.
         //  \deprecated(2018-01) - use readIfPresent() method
         template<class T>
-        bool FOAM_DEPRECATED_FOR(2018-01, "readIfPresent() method")
-        optionReadIfPresent
+        FOAM_DEPRECATED_FOR(2018-01, "readIfPresent() method")
+        bool optionReadIfPresent
         (
             const word& optName,
             T& val,
@@ -703,8 +703,8 @@ public:
         //  Return supplied default otherwise.
         //  \deprecated(2018-01) - use getOrDefault() method
         template<class T>
-        T FOAM_DEPRECATED_FOR(2018-01, "getOrDefault() method")
-        optionLookupOrDefault
+        FOAM_DEPRECATED_FOR(2018-01, "getOrDefault() method")
+        T optionLookupOrDefault
         (
             const word& optName,
             const T& deflt
@@ -716,8 +716,8 @@ public:
         //- Deprecated(2018-01) read a List of values from the named option
         //  \deprecated(2018-01) - use getList() method
         template<class T>
-        List<T> FOAM_DEPRECATED_FOR(2018-01, "getList() method")
-        optionReadList(const word& optName) const
+        FOAM_DEPRECATED_FOR(2018-01, "getList() method")
+        List<T> optionReadList(const word& optName) const
         {
             return this->getList<T>(optName);
         }
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 461a1a99..abbff3ba 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -505,22 +505,24 @@ public:
 
         //- Deprecated(2019-04) raw data pointer, const access
         //  \deprecated(2019-04) - use cdata() method
-        const Type* FOAM_DEPRECATED_FOR(2019-04, "cdata() method") v() const
+        FOAM_DEPRECATED_FOR(2019-04, "cdata() method")
+        const Type* v() const
         {
             return v_;
         }
 
         //- Deprecated(2019-04) raw data pointer, non-const access
         //  \deprecated(2019-04) - use data() method
-        Type* FOAM_DEPRECATED_FOR(2019-04, "data() method") v()
+        FOAM_DEPRECATED_FOR(2019-04, "data() method")
+        Type* v()
         {
             return v_;
         }
 
         //- Deprecated(2019-04) - use subMatrix()
         //  \deprecated(2019-04) - use subMatrix()
-        ConstMatrixBlock<mType>
-        FOAM_DEPRECATED_FOR(2019-04, "subMatrix() method") block
+        FOAM_DEPRECATED_FOR(2019-04, "subMatrix() method")
+        ConstMatrixBlock<mType> block
         (
             const label m,
             const label n,
@@ -533,8 +535,8 @@ public:
 
         //- Deprecated(2019-04) - use subMatrix()
         //  \deprecated(2019-04) - use subMatrix()
-        MatrixBlock<mType>
-        FOAM_DEPRECATED_FOR(2019-04, "subMatrix() method") block
+        FOAM_DEPRECATED_FOR(2019-04, "subMatrix() method")
+        MatrixBlock<mType> block
         (
             const label m,
             const label n,
@@ -548,8 +550,8 @@ public:
 
         //- Deprecated(2019-04) - use subColumn()
         //  \deprecated(2019-04) - use subColumn()
-        ConstMatrixBlock<mType>
-        FOAM_DEPRECATED_FOR(2019-04, "subColumn() method") col
+        FOAM_DEPRECATED_FOR(2019-04, "subColumn() method")
+        ConstMatrixBlock<mType> col
         (
             const label m,
             const label mStart,
@@ -561,8 +563,8 @@ public:
 
         //- Deprecated(2019-04) - use subColumn()
         //  \deprecated(2019-04) - use subColumn()
-        MatrixBlock<mType>
-        FOAM_DEPRECATED_FOR(2019-04, "subColumn() method") col
+        FOAM_DEPRECATED_FOR(2019-04, "subColumn() method")
+        MatrixBlock<mType> col
         (
             const label m,
             const label mStart,
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index d6612f4d..45a78907 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -203,8 +203,8 @@ public:
 
         //- Legacy name for areaNormal()
         //  \deprecated(2018-06) Deprecated for new use
-        vector FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
-        normal(const UList<point>& p) const
+        FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
+        vector normal(const UList<point>& p) const
         {
             return areaNormal(p); // Legacy definition
         }
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index af17d81f..111e7984 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -134,8 +134,8 @@ public:
 
         //- Legacy name for areaNormal()
         //  \deprecated(2018-06) Deprecated for new use
-        vector FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
-        normal(const UList<point>& points) const
+        FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
+        vector normal(const UList<point>& points) const
         {
             return areaNormal(points); // Legacy definition
         }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
index 8f3a55e0..22ffff5e 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
@@ -217,8 +217,8 @@ public:
 
             //- Legacy name for areaNormal().
             //  \deprecated(2018-06) Deprecated for new use
-            vector FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
-            normal() const
+            FOAM_DEPRECATED_FOR(2018-12, "areaNormal() or unitNormal()")
+            vector normal() const
             {
                 return areaNormal();
             }
diff --git a/src/OpenFOAM/primitives/Scalar/doubleFloat.H b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
index 4442a4eb..d4c5f6e1 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleFloat.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
@@ -67,11 +67,19 @@ MAXMINPOW(double, double, int)
 MAXMINPOW(double, int, double)
 MAXMINPOW(double, double, long)
 MAXMINPOW(double, long, double)
+#if defined(__APPLE__) && WM_LABEL_SIZE == 64
+MAXMINPOW(double, double, int64_t)
+MAXMINPOW(double, int64_t, double)
+#endif
 MAXMINPOW(float, float, float)
 MAXMINPOW(float, float, int)
 MAXMINPOW(float, int, float)
 MAXMINPOW(float, float, long)
 MAXMINPOW(float, long, float)
+#if defined(__APPLE__) && WM_LABEL_SIZE == 64
+MAXMINPOW(float, float, int64_t)
+MAXMINPOW(float, int64_t, float)
+#endif
 
 #undef MAXMINPOW
 
diff --git a/src/OpenFOAM/primitives/enums/Enum.H b/src/OpenFOAM/primitives/enums/Enum.H
index 02090993..0cdd5c9c 100644
--- a/src/OpenFOAM/primitives/enums/Enum.H
+++ b/src/OpenFOAM/primitives/enums/Enum.H
@@ -282,8 +282,8 @@ public:
 
         //- Deprecated(2018-10) same as two-parameter get()
         //  \deprecated(2018-10) - use two-parameter get() method
-        EnumType FOAM_DEPRECATED_FOR(2018-10, "get() method")
-        lookup(const word& key, const dictionary& dict) const
+        FOAM_DEPRECATED_FOR(2018-10, "get() method")
+        EnumType lookup(const word& key, const dictionary& dict) const
         {
             return get(key, dict);
         }
diff --git a/src/OpenFOAM/primitives/enums/NamedEnum.H b/src/OpenFOAM/primitives/enums/NamedEnum.H
index 0bd09497..8dd69dd2 100644
--- a/src/OpenFOAM/primitives/enums/NamedEnum.H
+++ b/src/OpenFOAM/primitives/enums/NamedEnum.H
@@ -102,8 +102,8 @@ public:
     // Constructors
 
         //- Construct from names
-        NamedEnum()
-        FOAM_DEPRECATED_FOR(2017-05, "Enum instead of using NamedEnum");
+        FOAM_DEPRECATED_FOR(2017-05, "Enum instead of using NamedEnum")
+        NamedEnum();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index 2bd429d5..e1364d8f 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -183,8 +183,8 @@ public:
 
         //- Deprecated(2019-01) Is the specified name found in the list?
         //  \deprecated(2019-01) - use found() method
-        bool FOAM_DEPRECATED_FOR(2019-01, "found() method")
-        contains(const word& name) const
+        FOAM_DEPRECATED_FOR(2019-01, "found() method")
+        bool contains(const word& name) const
         {
             return this->found(name);
         }
diff --git a/src/fileFormats/ensight/part/ensightPart.H b/src/fileFormats/ensight/part/ensightPart.H
index 2b9d3f9d..b46c6d1a 100644
--- a/src/fileFormats/ensight/part/ensightPart.H
+++ b/src/fileFormats/ensight/part/ensightPart.H
@@ -158,8 +158,8 @@ public:
 
         //- Deprecated(2019-12) - use rename() method
         //  \deprecated(2019-12) - use rename() method
-        void FOAM_DEPRECATED_FOR(2019-12, "rename() method")
-        name(string value)
+        FOAM_DEPRECATED_FOR(2019-12, "rename() method")
+        void name(string value)
         {
             name_ = std::move(value);
         }