diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
index f479e6ee8f..edd1f0980e 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
@@ -266,7 +266,10 @@ void Foam::PackedList<Width>::writeEntry
     Ostream& os
 ) const
 {
-    os.writeKeyword(keyword);
+    if (keyword.size())
+    {
+        os.writeKeyword(keyword);
+    }
     writeEntry(os);
     os  << token::END_STATEMENT << endl;
 }
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C b/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
index ab7d52b60f..1dacd491f9 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
@@ -103,7 +103,10 @@ void Foam::bitSet::writeEntry
     Ostream& os
 ) const
 {
-    os.writeKeyword(keyword);
+    if (keyword.size())
+    {
+        os.writeKeyword(keyword);
+    }
     writeEntry(os);
     os  << token::END_STATEMENT << endl;
 }
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index 529ac2f419..171c9e074e 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
@@ -39,7 +39,7 @@ void Foam::FixedList<T, N>::writeEntry(Ostream& os) const
     const word tag = "List<" + word(pTraits<T>::typeName) + '>';
     if (token::compound::isCompound(tag))
     {
-        os  << tag << ' ';
+        os  << tag << token::SPACE;
     }
     os << *this;
 }
@@ -54,7 +54,10 @@ void Foam::FixedList<T, N>::writeEntry
     Ostream& os
 ) const
 {
-    os.writeKeyword(keyword);
+    if (keyword.size())
+    {
+        os.writeKeyword(keyword);
+    }
     writeEntry(os);
     os << token::END_STATEMENT << endl;
 }
diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C
index 0b17796b0b..81a6fad37f 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListIO.C
+++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C
@@ -42,7 +42,7 @@ void Foam::UList<T>::writeEntry(Ostream& os) const
         const word tag = "List<" + word(pTraits<T>::typeName) + '>';
         if (token::compound::isCompound(tag))
         {
-            os  << tag << ' ';
+            os  << tag << token::SPACE;
         }
         os << *this;
     }
@@ -64,7 +64,10 @@ void Foam::UList<T>::writeEntry(Ostream& os) const
 template<class T>
 void Foam::UList<T>::writeEntry(const word& keyword, Ostream& os) const
 {
-    os.writeKeyword(keyword);
+    if (keyword.size())
+    {
+        os.writeKeyword(keyword);
+    }
     writeEntry(os);
     os << token::END_STATEMENT << endl;
 }
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 549b6d850f..ec5e891691 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -630,18 +630,21 @@ Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::T() const
 template<class Type>
 void Foam::Field<Type>::writeEntry(const word& keyword, Ostream& os) const
 {
-    os.writeKeyword(keyword);
+    if (keyword.size())
+    {
+        os.writeKeyword(keyword);
+    }
 
     // The contents are 'uniform' if the list is non-empty
     // and all entries have identical values.
 
     if (is_contiguous<Type>::value && List<Type>::uniform())
     {
-        os << "uniform " << this->first();
+        os << word("uniform") << token::SPACE << this->first();
     }
     else
     {
-        os << "nonuniform ";
+        os << word("nonuniform") << token::SPACE;
         List<Type>::writeEntry(os);
     }