188 files changed, 873 insertions, 873 deletions

diff --git a/src/WixToolset.Data/Tuples/ActionTextTuple.cs b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
index 771a8b02..e816a5e1 100644
--- a/src/WixToolset.Data/Tuples/ActionTextTuple.cs
+++ b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ActionTextTupleFields.Action];
             set => this.Set((int)ActionTextTupleFields.Action, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ActionTextTupleFields.Description];
             set => this.Set((int)ActionTextTupleFields.Description, value);
         }
 
         public string Template
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Template]?.Value;
+            get => (string)this.Fields[(int)ActionTextTupleFields.Template];
             set => this.Set((int)ActionTextTupleFields.Template, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs
index 25c717e0..6dea5cfc 100644
--- a/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/AdminExecuteSequenceTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Action];
             set => this.Set((int)AdminExecuteSequenceTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)AdminExecuteSequenceTupleFields.Condition];
             set => this.Set((int)AdminExecuteSequenceTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)AdminExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)AdminExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)AdminExecuteSequenceTupleFields.Sequence, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs b/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs
index d4681bb9..b6830b74 100644
--- a/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/AdminUISequenceTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Action];
             set => this.Set((int)AdminUISequenceTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)AdminUISequenceTupleFields.Condition];
             set => this.Set((int)AdminUISequenceTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)AdminUISequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)AdminUISequenceTupleFields.Sequence];
             set => this.Set((int)AdminUISequenceTupleFields.Sequence, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs
index 36a53af2..e2e808c9 100644
--- a/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/AdvtExecuteSequenceTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Action];
             set => this.Set((int)AdvtExecuteSequenceTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)AdvtExecuteSequenceTupleFields.Condition];
             set => this.Set((int)AdvtExecuteSequenceTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)AdvtExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)AdvtExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)AdvtExecuteSequenceTupleFields.Sequence, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/AppIdTuple.cs b/src/WixToolset.Data/Tuples/AppIdTuple.cs
index 7816e4c3..22cec56e 100644
--- a/src/WixToolset.Data/Tuples/AppIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppIdTuple.cs
@@ -49,43 +49,43 @@ namespace WixToolset.Data.Tuples
 
         public string AppId
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.AppId]?.Value;
+            get => (string)this.Fields[(int)AppIdTupleFields.AppId];
             set => this.Set((int)AppIdTupleFields.AppId, value);
         }
 
         public string RemoteServerName
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.RemoteServerName]?.Value;
+            get => (string)this.Fields[(int)AppIdTupleFields.RemoteServerName];
             set => this.Set((int)AppIdTupleFields.RemoteServerName, value);
         }
 
         public string LocalService
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.LocalService]?.Value;
+            get => (string)this.Fields[(int)AppIdTupleFields.LocalService];
             set => this.Set((int)AppIdTupleFields.LocalService, value);
         }
 
         public string ServiceParameters
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.ServiceParameters]?.Value;
+            get => (string)this.Fields[(int)AppIdTupleFields.ServiceParameters];
             set => this.Set((int)AppIdTupleFields.ServiceParameters, value);
         }
 
         public string DllSurrogate
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.DllSurrogate]?.Value;
+            get => (string)this.Fields[(int)AppIdTupleFields.DllSurrogate];
             set => this.Set((int)AppIdTupleFields.DllSurrogate, value);
         }
 
-        public int ActivateAtStorage
+        public bool? ActivateAtStorage
         {
-            get => (int)this.Fields[(int)AppIdTupleFields.ActivateAtStorage]?.Value;
+            get => (bool?)this.Fields[(int)AppIdTupleFields.ActivateAtStorage];
             set => this.Set((int)AppIdTupleFields.ActivateAtStorage, value);
         }
 
-        public int RunAsInteractiveUser
+        public bool? RunAsInteractiveUser
         {
-            get => (int)this.Fields[(int)AppIdTupleFields.RunAsInteractiveUser]?.Value;
+            get => (bool?)this.Fields[(int)AppIdTupleFields.RunAsInteractiveUser];
             set => this.Set((int)AppIdTupleFields.RunAsInteractiveUser, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/AppSearchTuple.cs b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
index e32064b8..4c03f847 100644
--- a/src/WixToolset.Data/Tuples/AppSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)AppSearchTupleFields.Property];
             set => this.Set((int)AppSearchTupleFields.Property, value);
         }
 
         public string Signature_
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.Signature_]?.Value;
+            get => (string)this.Fields[(int)AppSearchTupleFields.Signature_];
             set => this.Set((int)AppSearchTupleFields.Signature_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/BBControlTuple.cs b/src/WixToolset.Data/Tuples/BBControlTuple.cs
index b9066f81..01a47097 100644
--- a/src/WixToolset.Data/Tuples/BBControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/BBControlTuple.cs
@@ -71,31 +71,31 @@ namespace WixToolset.Data.Tuples
 
         public string Billboard_
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Billboard_]?.Value;
+            get => (string)this.Fields[(int)BBControlTupleFields.Billboard_];
             set => this.Set((int)BBControlTupleFields.Billboard_, value);
         }
 
         public string BBControl
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.BBControl]?.Value;
+            get => (string)this.Fields[(int)BBControlTupleFields.BBControl];
             set => this.Set((int)BBControlTupleFields.BBControl, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Type]?.Value;
+            get => (string)this.Fields[(int)BBControlTupleFields.Type];
             set => this.Set((int)BBControlTupleFields.Type, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.X]?.Value;
+            get => (int)this.Fields[(int)BBControlTupleFields.X];
             set => this.Set((int)BBControlTupleFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.Y]?.Value;
+            get => (int)this.Fields[(int)BBControlTupleFields.Y];
             set => this.Set((int)BBControlTupleFields.Y, value);
         }
 
@@ -107,7 +107,7 @@ namespace WixToolset.Data.Tuples
 
         public int Height
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.Height]?.Value;
+            get => (int)this.Fields[(int)BBControlTupleFields.Height];
             set => this.Set((int)BBControlTupleFields.Height, value);
         }
 
@@ -167,13 +167,13 @@ namespace WixToolset.Data.Tuples
 
         public string Text
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)BBControlTupleFields.Text];
             set => this.Set((int)BBControlTupleFields.Text, value);
         }
 
         public string SourceFile
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.SourceFile]?.Value;
+            get => (string)this.Fields[(int)BBControlTupleFields.SourceFile];
             set => this.Set((int)BBControlTupleFields.SourceFile, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/BillboardTuple.cs b/src/WixToolset.Data/Tuples/BillboardTuple.cs
index 43e2ace7..43a05a71 100644
--- a/src/WixToolset.Data/Tuples/BillboardTuple.cs
+++ b/src/WixToolset.Data/Tuples/BillboardTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Billboard
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.Billboard]?.Value;
+            get => (string)this.Fields[(int)BillboardTupleFields.Billboard];
             set => this.Set((int)BillboardTupleFields.Billboard, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)BillboardTupleFields.Feature_];
             set => this.Set((int)BillboardTupleFields.Feature_, value);
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)BillboardTupleFields.Action];
             set => this.Set((int)BillboardTupleFields.Action, value);
         }
 
         public int Ordering
         {
-            get => (int)this.Fields[(int)BillboardTupleFields.Ordering]?.Value;
+            get => (int)this.Fields[(int)BillboardTupleFields.Ordering];
             set => this.Set((int)BillboardTupleFields.Ordering, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/BinaryTuple.cs b/src/WixToolset.Data/Tuples/BinaryTuple.cs
index 8134167b..061f6f71 100644
--- a/src/WixToolset.Data/Tuples/BinaryTuple.cs
+++ b/src/WixToolset.Data/Tuples/BinaryTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)BinaryTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)BinaryTupleFields.Name];
             set => this.Set((int)BinaryTupleFields.Name, value);
         }
 
         public string Data
         {
-            get => (string)this.Fields[(int)BinaryTupleFields.Data]?.Value;
+            get => (string)this.Fields[(int)BinaryTupleFields.Data];
             set => this.Set((int)BinaryTupleFields.Data, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/BindImageTuple.cs b/src/WixToolset.Data/Tuples/BindImageTuple.cs
index fefafa2d..14622238 100644
--- a/src/WixToolset.Data/Tuples/BindImageTuple.cs
+++ b/src/WixToolset.Data/Tuples/BindImageTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)BindImageTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)BindImageTupleFields.File_];
             set => this.Set((int)BindImageTupleFields.File_, value);
         }
 
         public string Path
         {
-            get => (string)this.Fields[(int)BindImageTupleFields.Path]?.Value;
+            get => (string)this.Fields[(int)BindImageTupleFields.Path];
             set => this.Set((int)BindImageTupleFields.Path, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/CCPSearchTuple.cs b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
index d1ca8458..3d849128 100644
--- a/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Signature_
         {
-            get => (string)this.Fields[(int)CCPSearchTupleFields.Signature_]?.Value;
+            get => (string)this.Fields[(int)CCPSearchTupleFields.Signature_];
             set => this.Set((int)CCPSearchTupleFields.Signature_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/CheckBoxTuple.cs b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
index d76609f2..b35ff1f0 100644
--- a/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)CheckBoxTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)CheckBoxTupleFields.Property];
             set => this.Set((int)CheckBoxTupleFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)CheckBoxTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)CheckBoxTupleFields.Value];
             set => this.Set((int)CheckBoxTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ClassTuple.cs b/src/WixToolset.Data/Tuples/ClassTuple.cs
index 17212a5e..f6ae4a4c 100644
--- a/src/WixToolset.Data/Tuples/ClassTuple.cs
+++ b/src/WixToolset.Data/Tuples/ClassTuple.cs
@@ -61,73 +61,73 @@ namespace WixToolset.Data.Tuples
 
         public string CLSID
         {
-            get => (string)this.Fields[(int)ClassTupleFields.CLSID]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.CLSID];
             set => this.Set((int)ClassTupleFields.CLSID, value);
         }
 
         public string Context
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Context]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Context];
             set => this.Set((int)ClassTupleFields.Context, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Component_];
             set => this.Set((int)ClassTupleFields.Component_, value);
         }
 
         public string ProgId_Default
         {
-            get => (string)this.Fields[(int)ClassTupleFields.ProgId_Default]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.ProgId_Default];
             set => this.Set((int)ClassTupleFields.ProgId_Default, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Description];
             set => this.Set((int)ClassTupleFields.Description, value);
         }
 
         public string AppId_
         {
-            get => (string)this.Fields[(int)ClassTupleFields.AppId_]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.AppId_];
             set => this.Set((int)ClassTupleFields.AppId_, value);
         }
 
         public string FileTypeMask
         {
-            get => (string)this.Fields[(int)ClassTupleFields.FileTypeMask]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.FileTypeMask];
             set => this.Set((int)ClassTupleFields.FileTypeMask, value);
         }
 
         public string Icon_
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Icon_]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Icon_];
             set => this.Set((int)ClassTupleFields.Icon_, value);
         }
 
         public int IconIndex
         {
-            get => (int)this.Fields[(int)ClassTupleFields.IconIndex]?.Value;
+            get => (int)this.Fields[(int)ClassTupleFields.IconIndex];
             set => this.Set((int)ClassTupleFields.IconIndex, value);
         }
 
         public string DefInprocHandler
         {
-            get => (string)this.Fields[(int)ClassTupleFields.DefInprocHandler]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.DefInprocHandler];
             set => this.Set((int)ClassTupleFields.DefInprocHandler, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Argument]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Argument];
             set => this.Set((int)ClassTupleFields.Argument, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)ClassTupleFields.Feature_];
             set => this.Set((int)ClassTupleFields.Feature_, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/ComboBoxTuple.cs b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
index 67acc30c..f3629c5f 100644
--- a/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Property];
             set => this.Set((int)ComboBoxTupleFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ComboBoxTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)ComboBoxTupleFields.Order];
             set => this.Set((int)ComboBoxTupleFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Value];
             set => this.Set((int)ComboBoxTupleFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)ComboBoxTupleFields.Text];
             set => this.Set((int)ComboBoxTupleFields.Text, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
index 37bc2a37..4a92d132 100644
--- a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
@@ -39,7 +39,7 @@ namespace WixToolset.Data.Tuples
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId]?.Value;
+            get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId];
             set => this.Set((int)CompLocatorTupleFields.ComponentId, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/ComplusTuple.cs b/src/WixToolset.Data/Tuples/ComplusTuple.cs
index 0287c689..f011bbd4 100644
--- a/src/WixToolset.Data/Tuples/ComplusTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComplusTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ComplusTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ComplusTupleFields.Component_];
             set => this.Set((int)ComplusTupleFields.Component_, value);
         }
 
         public int ExpType
         {
-            get => (int)this.Fields[(int)ComplusTupleFields.ExpType]?.Value;
+            get => (int)this.Fields[(int)ComplusTupleFields.ExpType];
             set => this.Set((int)ComplusTupleFields.ExpType, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ComponentTuple.cs b/src/WixToolset.Data/Tuples/ComponentTuple.cs
index 8af887ed..f573818e 100644
--- a/src/WixToolset.Data/Tuples/ComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComponentTuple.cs
@@ -72,19 +72,19 @@ namespace WixToolset.Data.Tuples
 
         public string Component
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.Component]?.Value;
+            get => (string)this.Fields[(int)ComponentTupleFields.Component];
             set => this.Set((int)ComponentTupleFields.Component, value);
         }
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.ComponentId]?.Value;
+            get => (string)this.Fields[(int)ComponentTupleFields.ComponentId];
             set => this.Set((int)ComponentTupleFields.ComponentId, value);
         }
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)ComponentTupleFields.Directory_];
             set => this.Set((int)ComponentTupleFields.Directory_, value);
         }
 
@@ -144,13 +144,13 @@ namespace WixToolset.Data.Tuples
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ComponentTupleFields.Condition];
             set => this.Set((int)ComponentTupleFields.Condition, value);
         }
 
         public string KeyPath
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.KeyPath]?.Value;
+            get => (string)this.Fields[(int)ComponentTupleFields.KeyPath];
             set => this.Set((int)ComponentTupleFields.KeyPath, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/ConditionTuple.cs b/src/WixToolset.Data/Tuples/ConditionTuple.cs
index 534f4cae..f62174f6 100644
--- a/src/WixToolset.Data/Tuples/ConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ConditionTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)ConditionTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)ConditionTupleFields.Feature_];
             set => this.Set((int)ConditionTupleFields.Feature_, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)ConditionTupleFields.Level]?.Value;
+            get => (int)this.Fields[(int)ConditionTupleFields.Level];
             set => this.Set((int)ConditionTupleFields.Level, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ConditionTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ConditionTupleFields.Condition];
             set => this.Set((int)ConditionTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
index 0b18dac1..5b2599ec 100644
--- a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Dialog_
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Dialog_]?.Value;
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Dialog_];
             set => this.Set((int)ControlConditionTupleFields.Dialog_, value);
         }
 
         public string Control_
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Control_]?.Value;
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Control_];
             set => this.Set((int)ControlConditionTupleFields.Control_, value);
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Action];
             set => this.Set((int)ControlConditionTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ControlConditionTupleFields.Condition];
             set => this.Set((int)ControlConditionTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ControlEventTuple.cs b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
index b44cd19e..6486673b 100644
--- a/src/WixToolset.Data/Tuples/ControlEventTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string Dialog_
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Dialog_]?.Value;
+            get => (string)this.Fields[(int)ControlEventTupleFields.Dialog_];
             set => this.Set((int)ControlEventTupleFields.Dialog_, value);
         }
 
         public string Control_
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Control_]?.Value;
+            get => (string)this.Fields[(int)ControlEventTupleFields.Control_];
             set => this.Set((int)ControlEventTupleFields.Control_, value);
         }
 
         public string Event
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Event]?.Value;
+            get => (string)this.Fields[(int)ControlEventTupleFields.Event];
             set => this.Set((int)ControlEventTupleFields.Event, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Argument]?.Value;
+            get => (string)this.Fields[(int)ControlEventTupleFields.Argument];
             set => this.Set((int)ControlEventTupleFields.Argument, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ControlEventTupleFields.Condition];
             set => this.Set((int)ControlEventTupleFields.Condition, value);
         }
 
         public int Ordering
         {
-            get => (int)this.Fields[(int)ControlEventTupleFields.Ordering]?.Value;
+            get => (int)this.Fields[(int)ControlEventTupleFields.Ordering];
             set => this.Set((int)ControlEventTupleFields.Ordering, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs
index f77c3689..d08d9311 100644
--- a/src/WixToolset.Data/Tuples/ControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlTuple.cs
@@ -79,43 +79,43 @@ namespace WixToolset.Data.Tuples
 
         public string Dialog_
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Dialog_]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Dialog_];
             set => this.Set((int)ControlTupleFields.Dialog_, value);
         }
 
         public string Control
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Control]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Control];
             set => this.Set((int)ControlTupleFields.Control, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Type]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Type];
             set => this.Set((int)ControlTupleFields.Type, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)ControlTupleFields.X]?.Value;
+            get => (int)this.Fields[(int)ControlTupleFields.X];
             set => this.Set((int)ControlTupleFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Y]?.Value;
+            get => (int)this.Fields[(int)ControlTupleFields.Y];
             set => this.Set((int)ControlTupleFields.Y, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Width]?.Value;
+            get => (int)this.Fields[(int)ControlTupleFields.Width];
             set => this.Set((int)ControlTupleFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Height]?.Value;
+            get => (int)this.Fields[(int)ControlTupleFields.Height];
             set => this.Set((int)ControlTupleFields.Height, value);
         }
 
@@ -266,25 +266,25 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Property];
             set => this.Set((int)ControlTupleFields.Property, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Text];
             set => this.Set((int)ControlTupleFields.Text, value);
         }
 
         public string Control_Next
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Control_Next]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Control_Next];
             set => this.Set((int)ControlTupleFields.Control_Next, value);
         }
 
         public string Help
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Help]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.Help];
             set => this.Set((int)ControlTupleFields.Help, value);
         }
 
@@ -296,7 +296,7 @@ namespace WixToolset.Data.Tuples
 
         public string SourceFile
         {
-            get => (string)this.Fields[(int)ControlTupleFields.SourceFile]?.Value;
+            get => (string)this.Fields[(int)ControlTupleFields.SourceFile];
             set => this.Set((int)ControlTupleFields.SourceFile, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
index 05b50a8b..585f274c 100644
--- a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
+++ b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)CreateFolderTupleFields.Directory_];
             set => this.Set((int)CreateFolderTupleFields.Directory_, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)CreateFolderTupleFields.Component_];
             set => this.Set((int)CreateFolderTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/CustomActionTuple.cs b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
index 9c92593a..fbda67fa 100644
--- a/src/WixToolset.Data/Tuples/CustomActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
@@ -93,7 +93,7 @@ namespace WixToolset.Data.Tuples
 
         public string Source
         {
-            get => (string)this.Fields[(int)CustomActionTupleFields.Source]?.Value;
+            get => (string)this.Fields[(int)CustomActionTupleFields.Source];
             set => this.Set((int)CustomActionTupleFields.Source, value);
         }
 
@@ -105,7 +105,7 @@ namespace WixToolset.Data.Tuples
 
         public string Target
         {
-            get => (string)this.Fields[(int)CustomActionTupleFields.Target]?.Value;
+            get => (string)this.Fields[(int)CustomActionTupleFields.Target];
             set => this.Set((int)CustomActionTupleFields.Target, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/DialogTuple.cs b/src/WixToolset.Data/Tuples/DialogTuple.cs
index d66c3b19..bc803d68 100644
--- a/src/WixToolset.Data/Tuples/DialogTuple.cs
+++ b/src/WixToolset.Data/Tuples/DialogTuple.cs
@@ -73,25 +73,25 @@ namespace WixToolset.Data.Tuples
 
         public int HCentering
         {
-            get => (int)this.Fields[(int)DialogTupleFields.HCentering]?.Value;
+            get => (int)this.Fields[(int)DialogTupleFields.HCentering];
             set => this.Set((int)DialogTupleFields.HCentering, value);
         }
 
         public int VCentering
         {
-            get => (int)this.Fields[(int)DialogTupleFields.VCentering]?.Value;
+            get => (int)this.Fields[(int)DialogTupleFields.VCentering];
             set => this.Set((int)DialogTupleFields.VCentering, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)DialogTupleFields.Width]?.Value;
+            get => (int)this.Fields[(int)DialogTupleFields.Width];
             set => this.Set((int)DialogTupleFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)DialogTupleFields.Height]?.Value;
+            get => (int)this.Fields[(int)DialogTupleFields.Height];
             set => this.Set((int)DialogTupleFields.Height, value);
         }
 
@@ -163,25 +163,25 @@ namespace WixToolset.Data.Tuples
 
         public string Title
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Title]?.Value;
+            get => (string)this.Fields[(int)DialogTupleFields.Title];
             set => this.Set((int)DialogTupleFields.Title, value);
         }
 
         public string Control_First
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_First]?.Value;
+            get => (string)this.Fields[(int)DialogTupleFields.Control_First];
             set => this.Set((int)DialogTupleFields.Control_First, value);
         }
 
         public string Control_Default
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_Default]?.Value;
+            get => (string)this.Fields[(int)DialogTupleFields.Control_Default];
             set => this.Set((int)DialogTupleFields.Control_Default, value);
         }
 
         public string Control_Cancel
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Control_Cancel]?.Value;
+            get => (string)this.Fields[(int)DialogTupleFields.Control_Cancel];
             set => this.Set((int)DialogTupleFields.Control_Cancel, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
index 38910333..45c7b3ee 100644
--- a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Signature_
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Signature_]?.Value;
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Signature_];
             set => this.Set((int)DrLocatorTupleFields.Signature_, value);
         }
 
         public string Parent
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Parent]?.Value;
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Parent];
             set => this.Set((int)DrLocatorTupleFields.Parent, value);
         }
 
         public string Path
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Path]?.Value;
+            get => (string)this.Fields[(int)DrLocatorTupleFields.Path];
             set => this.Set((int)DrLocatorTupleFields.Path, value);
         }
 
         public int Depth
         {
-            get => (int)this.Fields[(int)DrLocatorTupleFields.Depth]?.Value;
+            get => (int)this.Fields[(int)DrLocatorTupleFields.Depth];
             set => this.Set((int)DrLocatorTupleFields.Depth, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
index b489025c..07a3b66d 100644
--- a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string FileKey
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.FileKey]?.Value;
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.FileKey];
             set => this.Set((int)DuplicateFileTupleFields.FileKey, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.Component_];
             set => this.Set((int)DuplicateFileTupleFields.Component_, value);
         }
 
         public string File_
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.File_];
             set => this.Set((int)DuplicateFileTupleFields.File_, value);
         }
 
         public string DestName
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestName]?.Value;
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestName];
             set => this.Set((int)DuplicateFileTupleFields.DestName, value);
         }
 
         public string DestFolder
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestFolder]?.Value;
+            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestFolder];
             set => this.Set((int)DuplicateFileTupleFields.DestFolder, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
index 7e3443d8..56b9f7d2 100644
--- a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
+++ b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
@@ -65,19 +65,19 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Name];
             set => this.Set((int)EnvironmentTupleFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Value];
             set => this.Set((int)EnvironmentTupleFields.Value, value);
         }
 
         public string Separator
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Separator]?.Value;
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Separator];
             set => this.Set((int)EnvironmentTupleFields.Separator, value);
         }
 
@@ -107,7 +107,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)EnvironmentTupleFields.Component_];
             set => this.Set((int)EnvironmentTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ErrorTuple.cs b/src/WixToolset.Data/Tuples/ErrorTuple.cs
index 393d2d29..e7c93c59 100644
--- a/src/WixToolset.Data/Tuples/ErrorTuple.cs
+++ b/src/WixToolset.Data/Tuples/ErrorTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public int Error
         {
-            get => (int)this.Fields[(int)ErrorTupleFields.Error]?.Value;
+            get => (int)this.Fields[(int)ErrorTupleFields.Error];
             set => this.Set((int)ErrorTupleFields.Error, value);
         }
 
         public string Message
         {
-            get => (string)this.Fields[(int)ErrorTupleFields.Message]?.Value;
+            get => (string)this.Fields[(int)ErrorTupleFields.Message];
             set => this.Set((int)ErrorTupleFields.Message, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/EventMappingTuple.cs b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
index e0e8da71..b83d5f4e 100644
--- a/src/WixToolset.Data/Tuples/EventMappingTuple.cs
+++ b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Dialog_
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Dialog_]?.Value;
+            get => (string)this.Fields[(int)EventMappingTupleFields.Dialog_];
             set => this.Set((int)EventMappingTupleFields.Dialog_, value);
         }
 
         public string Control_
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Control_]?.Value;
+            get => (string)this.Fields[(int)EventMappingTupleFields.Control_];
             set => this.Set((int)EventMappingTupleFields.Control_, value);
         }
 
         public string Event
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Event]?.Value;
+            get => (string)this.Fields[(int)EventMappingTupleFields.Event];
             set => this.Set((int)EventMappingTupleFields.Event, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Attribute]?.Value;
+            get => (string)this.Fields[(int)EventMappingTupleFields.Attribute];
             set => this.Set((int)EventMappingTupleFields.Attribute, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ExtensionTuple.cs b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
index e3ef1675..c4f273b3 100644
--- a/src/WixToolset.Data/Tuples/ExtensionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Extension
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Extension]?.Value;
+            get => (string)this.Fields[(int)ExtensionTupleFields.Extension];
             set => this.Set((int)ExtensionTupleFields.Extension, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ExtensionTupleFields.Component_];
             set => this.Set((int)ExtensionTupleFields.Component_, value);
         }
 
         public string ProgId_
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.ProgId_]?.Value;
+            get => (string)this.Fields[(int)ExtensionTupleFields.ProgId_];
             set => this.Set((int)ExtensionTupleFields.ProgId_, value);
         }
 
         public string MIME_
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.MIME_]?.Value;
+            get => (string)this.Fields[(int)ExtensionTupleFields.MIME_];
             set => this.Set((int)ExtensionTupleFields.MIME_, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)ExtensionTupleFields.Feature_];
             set => this.Set((int)ExtensionTupleFields.Feature_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
index 06e6d4ae..c3352c13 100644
--- a/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
+++ b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
@@ -51,49 +51,49 @@ namespace WixToolset.Data.Tuples
 
         public string Family
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.Family]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.Family];
             set => this.Set((int)ExternalFilesTupleFields.Family, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.FTK]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.FTK];
             set => this.Set((int)ExternalFilesTupleFields.FTK, value);
         }
 
         public string FilePath
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.FilePath]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.FilePath];
             set => this.Set((int)ExternalFilesTupleFields.FilePath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.SymbolPaths];
             set => this.Set((int)ExternalFilesTupleFields.SymbolPaths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreOffsets]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreOffsets];
             set => this.Set((int)ExternalFilesTupleFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreLengths]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreLengths];
             set => this.Set((int)ExternalFilesTupleFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.RetainOffsets]?.Value;
+            get => (string)this.Fields[(int)ExternalFilesTupleFields.RetainOffsets];
             set => this.Set((int)ExternalFilesTupleFields.RetainOffsets, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ExternalFilesTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)ExternalFilesTupleFields.Order];
             set => this.Set((int)ExternalFilesTupleFields.Order, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
index 5065c389..ea2e1993 100644
--- a/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
+++ b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Family
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.Family]?.Value;
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.Family];
             set => this.Set((int)FamilyFileRangesTupleFields.Family, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.FTK]?.Value;
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.FTK];
             set => this.Set((int)FamilyFileRangesTupleFields.FTK, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainOffsets]?.Value;
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainOffsets];
             set => this.Set((int)FamilyFileRangesTupleFields.RetainOffsets, value);
         }
 
         public string RetainLengths
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainLengths]?.Value;
+            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainLengths];
             set => this.Set((int)FamilyFileRangesTupleFields.RetainLengths, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
index e9d54c37..33f17ee9 100644
--- a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Feature_];
             set => this.Set((int)FeatureComponentsTupleFields.Feature_, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)FeatureComponentsTupleFields.Component_];
             set => this.Set((int)FeatureComponentsTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/FeatureTuple.cs b/src/WixToolset.Data/Tuples/FeatureTuple.cs
index c3b0e67a..14a1a9f5 100644
--- a/src/WixToolset.Data/Tuples/FeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureTuple.cs
@@ -68,37 +68,37 @@ namespace WixToolset.Data.Tuples
 
         public string Feature_Parent
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Feature_Parent]?.Value;
+            get => (string)this.Fields[(int)FeatureTupleFields.Feature_Parent];
             set => this.Set((int)FeatureTupleFields.Feature_Parent, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Title]?.Value;
+            get => (string)this.Fields[(int)FeatureTupleFields.Title];
             set => this.Set((int)FeatureTupleFields.Title, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)FeatureTupleFields.Description];
             set => this.Set((int)FeatureTupleFields.Description, value);
         }
 
         public int Display
         {
-            get => (int)this.Fields[(int)FeatureTupleFields.Display]?.Value;
+            get => (int)this.Fields[(int)FeatureTupleFields.Display];
             set => this.Set((int)FeatureTupleFields.Display, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)FeatureTupleFields.Level]?.Value;
+            get => (int)this.Fields[(int)FeatureTupleFields.Level];
             set => this.Set((int)FeatureTupleFields.Level, value);
         }
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)FeatureTupleFields.Directory_];
             set => this.Set((int)FeatureTupleFields.Directory_, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
index 7409577f..b5edfd2b 100644
--- a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.File_];
             set => this.Set((int)FileSFPCatalogTupleFields.File_, value);
         }
 
         public string SFPCatalog_
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalog_]?.Value;
+            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalog_];
             set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalog_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index 2f283406..1271ad55 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -61,79 +61,79 @@ namespace WixToolset.Data.Tuples
 
         public string File
         {
-            get => (string)this.Fields[(int)FileTupleFields.File]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.File];
             set => this.Set((int)FileTupleFields.File, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)FileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.Component_];
             set => this.Set((int)FileTupleFields.Component_, value);
         }
 
         public string ShortFileName
         {
-            get => (string)this.Fields[(int)FileTupleFields.ShortFileName]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.ShortFileName];
             set => this.Set((int)FileTupleFields.ShortFileName, value);
         }
 
         public string LongFileName
         {
-            get => (string)this.Fields[(int)FileTupleFields.LongFileName]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.LongFileName];
             set => this.Set((int)FileTupleFields.LongFileName, value);
         }
 
         public int FileSize
         {
-            get => (int)this.Fields[(int)FileTupleFields.FileSize]?.Value;
+            get => (int)this.Fields[(int)FileTupleFields.FileSize];
             set => this.Set((int)FileTupleFields.FileSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)FileTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.Version];
             set => this.Set((int)FileTupleFields.Version, value);
         }
 
         public string Language
         {
-            get => (string)this.Fields[(int)FileTupleFields.Language]?.Value;
+            get => (string)this.Fields[(int)FileTupleFields.Language];
             set => this.Set((int)FileTupleFields.Language, value);
         }
 
         public bool ReadOnly
         {
-            get => (bool)this.Fields[(int)FileTupleFields.ReadOnly]?.Value;
+            get => (bool)this.Fields[(int)FileTupleFields.ReadOnly];
             set => this.Set((int)FileTupleFields.ReadOnly, value);
         }
 
         public bool Hidden
         {
-            get => (bool)this.Fields[(int)FileTupleFields.Hidden]?.Value;
+            get => (bool)this.Fields[(int)FileTupleFields.Hidden];
             set => this.Set((int)FileTupleFields.Hidden, value);
         }
 
         public bool System
         {
-            get => (bool)this.Fields[(int)FileTupleFields.System]?.Value;
+            get => (bool)this.Fields[(int)FileTupleFields.System];
             set => this.Set((int)FileTupleFields.System, value);
         }
 
         public bool Vital
         {
-            get => (bool)this.Fields[(int)FileTupleFields.Vital]?.Value;
+            get => (bool)this.Fields[(int)FileTupleFields.Vital];
             set => this.Set((int)FileTupleFields.Vital, value);
         }
 
         public bool Checksum
         {
-            get => (bool)this.Fields[(int)FileTupleFields.Checksum]?.Value;
+            get => (bool)this.Fields[(int)FileTupleFields.Checksum];
             set => this.Set((int)FileTupleFields.Checksum, value);
         }
 
         public bool? Compressed
         {
-            get => (bool?)this.Fields[(int)FileTupleFields.Compressed]?.Value;
+            get => (bool?)this.Fields[(int)FileTupleFields.Compressed];
             set => this.Set((int)FileTupleFields.Compressed, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/FontTuple.cs b/src/WixToolset.Data/Tuples/FontTuple.cs
index 97550148..12f41321 100644
--- a/src/WixToolset.Data/Tuples/FontTuple.cs
+++ b/src/WixToolset.Data/Tuples/FontTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)FontTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)FontTupleFields.File_];
             set => this.Set((int)FontTupleFields.File_, value);
         }
 
         public string FontTitle
         {
-            get => (string)this.Fields[(int)FontTupleFields.FontTitle]?.Value;
+            get => (string)this.Fields[(int)FontTupleFields.FontTitle];
             set => this.Set((int)FontTupleFields.FontTitle, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/IconTuple.cs b/src/WixToolset.Data/Tuples/IconTuple.cs
index 0ccd9a53..0644f47d 100644
--- a/src/WixToolset.Data/Tuples/IconTuple.cs
+++ b/src/WixToolset.Data/Tuples/IconTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)IconTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)IconTupleFields.Name];
             set => this.Set((int)IconTupleFields.Name, value);
         }
 
         public string Data
         {
-            get => (string)this.Fields[(int)IconTupleFields.Data]?.Value;
+            get => (string)this.Fields[(int)IconTupleFields.Data];
             set => this.Set((int)IconTupleFields.Data, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
index 7ce884ca..d06302a6 100644
--- a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
+++ b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string Family
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.Family]?.Value;
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.Family];
             set => this.Set((int)ImageFamiliesTupleFields.Family, value);
         }
 
         public string MediaSrcPropName
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.MediaSrcPropName]?.Value;
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.MediaSrcPropName];
             set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value);
         }
 
         public int MediaDiskId
         {
-            get => (int)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId]?.Value;
+            get => (int)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId];
             set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
         }
 
         public int FileSequenceStart
         {
-            get => (int)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart]?.Value;
+            get => (int)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart];
             set => this.Set((int)ImageFamiliesTupleFields.FileSequenceStart, value);
         }
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.DiskPrompt]?.Value;
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.DiskPrompt];
             set => this.Set((int)ImageFamiliesTupleFields.DiskPrompt, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.VolumeLabel]?.Value;
+            get => (string)this.Fields[(int)ImageFamiliesTupleFields.VolumeLabel];
             set => this.Set((int)ImageFamiliesTupleFields.VolumeLabel, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/IniFileTuple.cs b/src/WixToolset.Data/Tuples/IniFileTuple.cs
index bae28817..804fff13 100644
--- a/src/WixToolset.Data/Tuples/IniFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniFileTuple.cs
@@ -49,31 +49,31 @@ namespace WixToolset.Data.Tuples
 
         public string FileName
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.FileName];
             set => this.Set((int)IniFileTupleFields.FileName, value);
         }
 
         public string DirProperty
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.DirProperty]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.DirProperty];
             set => this.Set((int)IniFileTupleFields.DirProperty, value);
         }
 
         public string Section
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Section]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.Section];
             set => this.Set((int)IniFileTupleFields.Section, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.Key];
             set => this.Set((int)IniFileTupleFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.Value];
             set => this.Set((int)IniFileTupleFields.Value, value);
         }
 
@@ -85,7 +85,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)IniFileTupleFields.Component_];
             set => this.Set((int)IniFileTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
index f956ee5f..84097f9c 100644
--- a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string Signature_
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Signature_]?.Value;
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Signature_];
             set => this.Set((int)IniLocatorTupleFields.Signature_, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)IniLocatorTupleFields.FileName];
             set => this.Set((int)IniLocatorTupleFields.FileName, value);
         }
 
         public string Section
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Section]?.Value;
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Section];
             set => this.Set((int)IniLocatorTupleFields.Section, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)IniLocatorTupleFields.Key];
             set => this.Set((int)IniLocatorTupleFields.Key, value);
         }
 
         public int Field
         {
-            get => (int)this.Fields[(int)IniLocatorTupleFields.Field]?.Value;
+            get => (int)this.Fields[(int)IniLocatorTupleFields.Field];
             set => this.Set((int)IniLocatorTupleFields.Field, value);
         }
 
         public int Type
         {
-            get => (int)this.Fields[(int)IniLocatorTupleFields.Type]?.Value;
+            get => (int)this.Fields[(int)IniLocatorTupleFields.Type];
             set => this.Set((int)IniLocatorTupleFields.Type, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs
index 390faf9d..0dbb00ed 100644
--- a/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/InstallExecuteSequenceTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Action];
             set => this.Set((int)InstallExecuteSequenceTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)InstallExecuteSequenceTupleFields.Condition];
             set => this.Set((int)InstallExecuteSequenceTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)InstallExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)InstallExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)InstallExecuteSequenceTupleFields.Sequence, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs b/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs
index 07409c37..09751df3 100644
--- a/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/InstallUISequenceTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Action];
             set => this.Set((int)InstallUISequenceTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)InstallUISequenceTupleFields.Condition];
             set => this.Set((int)InstallUISequenceTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)InstallUISequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)InstallUISequenceTupleFields.Sequence];
             set => this.Set((int)InstallUISequenceTupleFields.Sequence, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
index 5fb4f8aa..3f037005 100644
--- a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Component_Shared
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Shared]?.Value;
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Shared];
             set => this.Set((int)IsolatedComponentTupleFields.Component_Shared, value);
         }
 
         public string Component_Application
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Application]?.Value;
+            get => (string)this.Fields[(int)IsolatedComponentTupleFields.Component_Application];
             set => this.Set((int)IsolatedComponentTupleFields.Component_Application, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
index f5718607..c895ea35 100644
--- a/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Condition
         {
-            get => (string)this.Fields[(int)LaunchConditionTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)LaunchConditionTupleFields.Condition];
             set => this.Set((int)LaunchConditionTupleFields.Condition, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)LaunchConditionTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)LaunchConditionTupleFields.Description];
             set => this.Set((int)LaunchConditionTupleFields.Description, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ListBoxTuple.cs b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
index 71702c07..c25f1728 100644
--- a/src/WixToolset.Data/Tuples/ListBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)ListBoxTupleFields.Property];
             set => this.Set((int)ListBoxTupleFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ListBoxTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)ListBoxTupleFields.Order];
             set => this.Set((int)ListBoxTupleFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ListBoxTupleFields.Value];
             set => this.Set((int)ListBoxTupleFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)ListBoxTupleFields.Text];
             set => this.Set((int)ListBoxTupleFields.Text, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ListViewTuple.cs b/src/WixToolset.Data/Tuples/ListViewTuple.cs
index 3b1f4c88..75a3758c 100644
--- a/src/WixToolset.Data/Tuples/ListViewTuple.cs
+++ b/src/WixToolset.Data/Tuples/ListViewTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)ListViewTupleFields.Property];
             set => this.Set((int)ListViewTupleFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ListViewTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)ListViewTupleFields.Order];
             set => this.Set((int)ListViewTupleFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ListViewTupleFields.Value];
             set => this.Set((int)ListViewTupleFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)ListViewTupleFields.Text];
             set => this.Set((int)ListViewTupleFields.Text, value);
         }
 
         public string Binary_
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Binary_]?.Value;
+            get => (string)this.Fields[(int)ListViewTupleFields.Binary_];
             set => this.Set((int)ListViewTupleFields.Binary_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs b/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
index cff4aaa0..e09b56a3 100644
--- a/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
+++ b/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string LockObject
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.LockObject]?.Value;
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.LockObject];
             set => this.Set((int)LockPermissionsTupleFields.LockObject, value);
         }
 
         public string Table
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.Table];
             set => this.Set((int)LockPermissionsTupleFields.Table, value);
         }
 
         public string Domain
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.Domain]?.Value;
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.Domain];
             set => this.Set((int)LockPermissionsTupleFields.Domain, value);
         }
 
         public string User
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.User]?.Value;
+            get => (string)this.Fields[(int)LockPermissionsTupleFields.User];
             set => this.Set((int)LockPermissionsTupleFields.User, value);
         }
 
         public int Permission
         {
-            get => (int)this.Fields[(int)LockPermissionsTupleFields.Permission]?.Value;
+            get => (int)this.Fields[(int)LockPermissionsTupleFields.Permission];
             set => this.Set((int)LockPermissionsTupleFields.Permission, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MIMETuple.cs b/src/WixToolset.Data/Tuples/MIMETuple.cs
index 8453275e..781015cb 100644
--- a/src/WixToolset.Data/Tuples/MIMETuple.cs
+++ b/src/WixToolset.Data/Tuples/MIMETuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string ContentType
         {
-            get => (string)this.Fields[(int)MIMETupleFields.ContentType]?.Value;
+            get => (string)this.Fields[(int)MIMETupleFields.ContentType];
             set => this.Set((int)MIMETupleFields.ContentType, value);
         }
 
         public string Extension_
         {
-            get => (string)this.Fields[(int)MIMETupleFields.Extension_]?.Value;
+            get => (string)this.Fields[(int)MIMETupleFields.Extension_];
             set => this.Set((int)MIMETupleFields.Extension_, value);
         }
 
         public string CLSID
         {
-            get => (string)this.Fields[(int)MIMETupleFields.CLSID]?.Value;
+            get => (string)this.Fields[(int)MIMETupleFields.CLSID];
             set => this.Set((int)MIMETupleFields.CLSID, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MediaTuple.cs b/src/WixToolset.Data/Tuples/MediaTuple.cs
index 305080c3..a78f56de 100644
--- a/src/WixToolset.Data/Tuples/MediaTuple.cs
+++ b/src/WixToolset.Data/Tuples/MediaTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)MediaTupleFields.DiskId]?.Value;
+            get => (int)this.Fields[(int)MediaTupleFields.DiskId];
             set => this.Set((int)MediaTupleFields.DiskId, value);
         }
 
         public int LastSequence
         {
-            get => (int)this.Fields[(int)MediaTupleFields.LastSequence]?.Value;
+            get => (int)this.Fields[(int)MediaTupleFields.LastSequence];
             set => this.Set((int)MediaTupleFields.LastSequence, value);
         }
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)MediaTupleFields.DiskPrompt]?.Value;
+            get => (string)this.Fields[(int)MediaTupleFields.DiskPrompt];
             set => this.Set((int)MediaTupleFields.DiskPrompt, value);
         }
 
         public string Cabinet
         {
-            get => (string)this.Fields[(int)MediaTupleFields.Cabinet]?.Value;
+            get => (string)this.Fields[(int)MediaTupleFields.Cabinet];
             set => this.Set((int)MediaTupleFields.Cabinet, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)MediaTupleFields.VolumeLabel]?.Value;
+            get => (string)this.Fields[(int)MediaTupleFields.VolumeLabel];
             set => this.Set((int)MediaTupleFields.VolumeLabel, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MediaTupleFields.Source]?.Value;
+            get => (string)this.Fields[(int)MediaTupleFields.Source];
             set => this.Set((int)MediaTupleFields.Source, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs
index 4f762214..eba7a431 100644
--- a/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleAdminExecuteSequenceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Action];
             set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Action, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Sequence, value);
         }
 
         public string BaseAction
         {
-            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.BaseAction]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.BaseAction];
             set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.BaseAction, value);
         }
 
         public int After
         {
-            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.After]?.Value;
+            get => (int)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.After];
             set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.After, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminExecuteSequenceTupleFields.Condition];
             set => this.Set((int)ModuleAdminExecuteSequenceTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs
index bc873b72..396a81da 100644
--- a/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleAdminUISequenceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Action];
             set => this.Set((int)ModuleAdminUISequenceTupleFields.Action, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.Sequence];
             set => this.Set((int)ModuleAdminUISequenceTupleFields.Sequence, value);
         }
 
         public string BaseAction
         {
-            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.BaseAction]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.BaseAction];
             set => this.Set((int)ModuleAdminUISequenceTupleFields.BaseAction, value);
         }
 
         public int After
         {
-            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.After]?.Value;
+            get => (int)this.Fields[(int)ModuleAdminUISequenceTupleFields.After];
             set => this.Set((int)ModuleAdminUISequenceTupleFields.After, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ModuleAdminUISequenceTupleFields.Condition];
             set => this.Set((int)ModuleAdminUISequenceTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs
index 2864be7e..146d09d0 100644
--- a/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleAdvtExecuteSequenceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Action];
             set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Action, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Sequence, value);
         }
 
         public string BaseAction
         {
-            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.BaseAction]?.Value;
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.BaseAction];
             set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.BaseAction, value);
         }
 
         public int After
         {
-            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.After]?.Value;
+            get => (int)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.After];
             set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.After, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ModuleAdvtExecuteSequenceTupleFields.Condition];
             set => this.Set((int)ModuleAdvtExecuteSequenceTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
index 24b9aab4..2b560b50 100644
--- a/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Component
         {
-            get => (string)this.Fields[(int)ModuleComponentsTupleFields.Component]?.Value;
+            get => (string)this.Fields[(int)ModuleComponentsTupleFields.Component];
             set => this.Set((int)ModuleComponentsTupleFields.Component, value);
         }
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleComponentsTupleFields.ModuleID]?.Value;
+            get => (string)this.Fields[(int)ModuleComponentsTupleFields.ModuleID];
             set => this.Set((int)ModuleComponentsTupleFields.ModuleID, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)ModuleComponentsTupleFields.Language]?.Value;
+            get => (int)this.Fields[(int)ModuleComponentsTupleFields.Language];
             set => this.Set((int)ModuleComponentsTupleFields.Language, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
index a1c2a777..fd0cf365 100644
--- a/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
@@ -55,25 +55,25 @@ namespace WixToolset.Data.Tuples
 
         public int Format
         {
-            get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Format]?.Value;
+            get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Format];
             set => this.Set((int)ModuleConfigurationTupleFields.Format, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Type]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Type];
             set => this.Set((int)ModuleConfigurationTupleFields.Type, value);
         }
 
         public string ContextData
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.ContextData]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.ContextData];
             set => this.Set((int)ModuleConfigurationTupleFields.ContextData, value);
         }
 
         public string DefaultValue
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DefaultValue]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DefaultValue];
             set => this.Set((int)ModuleConfigurationTupleFields.DefaultValue, value);
         }
 
@@ -91,25 +91,25 @@ namespace WixToolset.Data.Tuples
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DisplayName];
             set => this.Set((int)ModuleConfigurationTupleFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Description];
             set => this.Set((int)ModuleConfigurationTupleFields.Description, value);
         }
 
         public string HelpLocation
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpLocation]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpLocation];
             set => this.Set((int)ModuleConfigurationTupleFields.HelpLocation, value);
         }
 
         public string HelpKeyword
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpKeyword]?.Value;
+            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpKeyword];
             set => this.Set((int)ModuleConfigurationTupleFields.HelpKeyword, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
index ed887207..8c857d41 100644
--- a/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.ModuleID]?.Value;
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.ModuleID];
             set => this.Set((int)ModuleDependencyTupleFields.ModuleID, value);
         }
 
         public int ModuleLanguage
         {
-            get => (int)this.Fields[(int)ModuleDependencyTupleFields.ModuleLanguage]?.Value;
+            get => (int)this.Fields[(int)ModuleDependencyTupleFields.ModuleLanguage];
             set => this.Set((int)ModuleDependencyTupleFields.ModuleLanguage, value);
         }
 
         public string RequiredID
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredID]?.Value;
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredID];
             set => this.Set((int)ModuleDependencyTupleFields.RequiredID, value);
         }
 
         public int RequiredLanguage
         {
-            get => (int)this.Fields[(int)ModuleDependencyTupleFields.RequiredLanguage]?.Value;
+            get => (int)this.Fields[(int)ModuleDependencyTupleFields.RequiredLanguage];
             set => this.Set((int)ModuleDependencyTupleFields.RequiredLanguage, value);
         }
 
         public string RequiredVersion
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredVersion]?.Value;
+            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredVersion];
             set => this.Set((int)ModuleDependencyTupleFields.RequiredVersion, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
index 968fc2cd..98c5ac5e 100644
--- a/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ModuleID]?.Value;
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ModuleID];
             set => this.Set((int)ModuleExclusionTupleFields.ModuleID, value);
         }
 
         public int ModuleLanguage
         {
-            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ModuleLanguage]?.Value;
+            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ModuleLanguage];
             set => this.Set((int)ModuleExclusionTupleFields.ModuleLanguage, value);
         }
 
         public string ExcludedID
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedID]?.Value;
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedID];
             set => this.Set((int)ModuleExclusionTupleFields.ExcludedID, value);
         }
 
         public int ExcludedLanguage
         {
-            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ExcludedLanguage]?.Value;
+            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ExcludedLanguage];
             set => this.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, value);
         }
 
         public string ExcludedMinVersion
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMinVersion]?.Value;
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMinVersion];
             set => this.Set((int)ModuleExclusionTupleFields.ExcludedMinVersion, value);
         }
 
         public string ExcludedMaxVersion
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMaxVersion]?.Value;
+            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMaxVersion];
             set => this.Set((int)ModuleExclusionTupleFields.ExcludedMaxVersion, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
index ec82c94b..d4262448 100644
--- a/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)ModuleIgnoreTableTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)ModuleIgnoreTableTupleFields.Table];
             set => this.Set((int)ModuleIgnoreTableTupleFields.Table, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs
index 22bb678c..07b79239 100644
--- a/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleInstallExecuteSequenceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Action];
             set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Action, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Sequence];
             set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Sequence, value);
         }
 
         public string BaseAction
         {
-            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.BaseAction]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.BaseAction];
             set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.BaseAction, value);
         }
 
         public int After
         {
-            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.After]?.Value;
+            get => (int)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.After];
             set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.After, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallExecuteSequenceTupleFields.Condition];
             set => this.Set((int)ModuleInstallExecuteSequenceTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs b/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs
index cc6e0c76..31bb8555 100644
--- a/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleInstallUISequenceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Action
         {
-            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Action];
             set => this.Set((int)ModuleInstallUISequenceTupleFields.Action, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.Sequence];
             set => this.Set((int)ModuleInstallUISequenceTupleFields.Sequence, value);
         }
 
         public string BaseAction
         {
-            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.BaseAction]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.BaseAction];
             set => this.Set((int)ModuleInstallUISequenceTupleFields.BaseAction, value);
         }
 
         public int After
         {
-            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.After]?.Value;
+            get => (int)this.Fields[(int)ModuleInstallUISequenceTupleFields.After];
             set => this.Set((int)ModuleInstallUISequenceTupleFields.After, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)ModuleInstallUISequenceTupleFields.Condition];
             set => this.Set((int)ModuleInstallUISequenceTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
index 836f769b..04db5f58 100644
--- a/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleSignatureTupleFields.ModuleID]?.Value;
+            get => (string)this.Fields[(int)ModuleSignatureTupleFields.ModuleID];
             set => this.Set((int)ModuleSignatureTupleFields.ModuleID, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)ModuleSignatureTupleFields.Language]?.Value;
+            get => (int)this.Fields[(int)ModuleSignatureTupleFields.Language];
             set => this.Set((int)ModuleSignatureTupleFields.Language, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)ModuleSignatureTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)ModuleSignatureTupleFields.Version];
             set => this.Set((int)ModuleSignatureTupleFields.Version, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
index 609670f0..76033560 100644
--- a/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Table];
             set => this.Set((int)ModuleSubstitutionTupleFields.Table, value);
         }
 
         public string Row
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Row]?.Value;
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Row];
             set => this.Set((int)ModuleSubstitutionTupleFields.Row, value);
         }
 
         public string Column
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Column]?.Value;
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Column];
             set => this.Set((int)ModuleSubstitutionTupleFields.Column, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Value];
             set => this.Set((int)ModuleSubstitutionTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MoveFileTuple.cs b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
index 404d39b3..7a0ff120 100644
--- a/src/WixToolset.Data/Tuples/MoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
@@ -49,43 +49,43 @@ namespace WixToolset.Data.Tuples
 
         public string FileKey
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.FileKey]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.FileKey];
             set => this.Set((int)MoveFileTupleFields.FileKey, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.Component_];
             set => this.Set((int)MoveFileTupleFields.Component_, value);
         }
 
         public string SourceName
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.SourceName]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.SourceName];
             set => this.Set((int)MoveFileTupleFields.SourceName, value);
         }
 
         public string DestName
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.DestName]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.DestName];
             set => this.Set((int)MoveFileTupleFields.DestName, value);
         }
 
         public string SourceFolder
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.SourceFolder]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.SourceFolder];
             set => this.Set((int)MoveFileTupleFields.SourceFolder, value);
         }
 
         public string DestFolder
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.DestFolder]?.Value;
+            get => (string)this.Fields[(int)MoveFileTupleFields.DestFolder];
             set => this.Set((int)MoveFileTupleFields.DestFolder, value);
         }
 
         public int Options
         {
-            get => (int)this.Fields[(int)MoveFileTupleFields.Options]?.Value;
+            get => (int)this.Fields[(int)MoveFileTupleFields.Options];
             set => this.Set((int)MoveFileTupleFields.Options, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
index a8e97b00..f4da9ea2 100644
--- a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Component_];
             set => this.Set((int)MsiAssemblyNameTupleFields.Component_, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Name];
             set => this.Set((int)MsiAssemblyNameTupleFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Value];
             set => this.Set((int)MsiAssemblyNameTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
index 0cd814d8..9a2c2c0d 100644
--- a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Component_];
             set => this.Set((int)MsiAssemblyTupleFields.Component_, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.Feature_];
             set => this.Set((int)MsiAssemblyTupleFields.Feature_, value);
         }
 
         public string File_Manifest
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Manifest]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Manifest];
             set => this.Set((int)MsiAssemblyTupleFields.File_Manifest, value);
         }
 
         public string File_Application
         {
-            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Application]?.Value;
+            get => (string)this.Fields[(int)MsiAssemblyTupleFields.File_Application];
             set => this.Set((int)MsiAssemblyTupleFields.File_Application, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)MsiAssemblyTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)MsiAssemblyTupleFields.Attributes];
             set => this.Set((int)MsiAssemblyTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
index fb949afb..52f1adea 100644
--- a/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string DigitalCertificate
         {
-            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.DigitalCertificate]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.DigitalCertificate];
             set => this.Set((int)MsiDigitalCertificateTupleFields.DigitalCertificate, value);
         }
 
         public string CertData
         {
-            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.CertData]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.CertData];
             set => this.Set((int)MsiDigitalCertificateTupleFields.CertData, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
index 8b30c53c..6292b0af 100644
--- a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Table];
             set => this.Set((int)MsiDigitalSignatureTupleFields.Table, value);
         }
 
         public string SignObject
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.SignObject]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.SignObject];
             set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
         }
 
         public string DigitalCertificate_
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificate_]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificate_];
             set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificate_, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Hash]?.Value;
+            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Hash];
             set => this.Set((int)MsiDigitalSignatureTupleFields.Hash, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
index 7f1b7a2a..72d92c3e 100644
--- a/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string MsiEmbeddedChainer
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer];
             set => this.Set((int)MsiEmbeddedChainerTupleFields.MsiEmbeddedChainer, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Condition];
             set => this.Set((int)MsiEmbeddedChainerTupleFields.Condition, value);
         }
 
         public string CommandLine
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.CommandLine]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.CommandLine];
             set => this.Set((int)MsiEmbeddedChainerTupleFields.CommandLine, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Source]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Source];
             set => this.Set((int)MsiEmbeddedChainerTupleFields.Source, value);
         }
 
         public int Type
         {
-            get => (int)this.Fields[(int)MsiEmbeddedChainerTupleFields.Type]?.Value;
+            get => (int)this.Fields[(int)MsiEmbeddedChainerTupleFields.Type];
             set => this.Set((int)MsiEmbeddedChainerTupleFields.Type, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
index b58f2c1a..83cfcc43 100644
--- a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
@@ -45,7 +45,7 @@ namespace WixToolset.Data.Tuples
 
         public string FileName
         {
-            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.FileName];
             set => this.Set((int)MsiEmbeddedUITupleFields.FileName, value);
         }
 
@@ -63,13 +63,13 @@ namespace WixToolset.Data.Tuples
 
         public int MessageFilter
         {
-            get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter]?.Value;
+            get => (int)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter];
             set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.Source]?.Value;
+            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.Source];
             set => this.Set((int)MsiEmbeddedUITupleFields.Source, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
index 2850bc22..bb6ec1ae 100644
--- a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)MsiFileHashTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)MsiFileHashTupleFields.File_];
             set => this.Set((int)MsiFileHashTupleFields.File_, value);
         }
 
         public int Options
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.Options]?.Value;
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.Options];
             set => this.Set((int)MsiFileHashTupleFields.Options, value);
         }
 
         public int HashPart1
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart1]?.Value;
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart1];
             set => this.Set((int)MsiFileHashTupleFields.HashPart1, value);
         }
 
         public int HashPart2
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart2]?.Value;
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart2];
             set => this.Set((int)MsiFileHashTupleFields.HashPart2, value);
         }
 
         public int HashPart3
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart3]?.Value;
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart3];
             set => this.Set((int)MsiFileHashTupleFields.HashPart3, value);
         }
 
         public int HashPart4
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart4]?.Value;
+            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart4];
             set => this.Set((int)MsiFileHashTupleFields.HashPart4, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
index 14fc62a3..5b648c05 100644
--- a/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string MsiLockPermissionsEx
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx]?.Value;
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx];
             set => this.Set((int)MsiLockPermissionsExTupleFields.MsiLockPermissionsEx, value);
         }
 
         public string LockObject
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject]?.Value;
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject];
             set => this.Set((int)MsiLockPermissionsExTupleFields.LockObject, value);
         }
 
         public string Table
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Table];
             set => this.Set((int)MsiLockPermissionsExTupleFields.Table, value);
         }
 
         public string SDDLText
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.SDDLText]?.Value;
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.SDDLText];
             set => this.Set((int)MsiLockPermissionsExTupleFields.SDDLText, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Condition];
             set => this.Set((int)MsiLockPermissionsExTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
index 6eeb141c..d758abb9 100644
--- a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string PackageCertificate
         {
-            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.PackageCertificate]?.Value;
+            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.PackageCertificate];
             set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
         }
 
         public string DigitalCertificate_
         {
-            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificate_]?.Value;
+            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificate_];
             set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificate_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
index 1b02dca9..511456dd 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string PatchCertificate
         {
-            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.PatchCertificate]?.Value;
+            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.PatchCertificate];
             set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
         }
 
         public string DigitalCertificate_
         {
-            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificate_]?.Value;
+            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificate_];
             set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificate_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
index 6d99a9ae..3f7a8de2 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string StreamRef
         {
-            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.StreamRef]?.Value;
+            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.StreamRef];
             set => this.Set((int)MsiPatchHeadersTupleFields.StreamRef, value);
         }
 
         public string Header
         {
-            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.Header]?.Value;
+            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.Header];
             set => this.Set((int)MsiPatchHeadersTupleFields.Header, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
index f6a6fd7d..91bdb6fd 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Company
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Company]?.Value;
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Company];
             set => this.Set((int)MsiPatchMetadataTupleFields.Company, value);
         }
 
         public string Property
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Property];
             set => this.Set((int)MsiPatchMetadataTupleFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Value];
             set => this.Set((int)MsiPatchMetadataTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
index f23ace77..ff874271 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.File_];
             set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.File_, value);
         }
 
         public string Assembly_
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.Assembly_]?.Value;
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.Assembly_];
             set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.Assembly_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
index 77385f5f..9e2b72e5 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Assembly
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Assembly]?.Value;
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Assembly];
             set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Assembly, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Name];
             set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Value];
             set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
index c48be28f..1d5a5d90 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string PatchFamily
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.PatchFamily]?.Value;
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.PatchFamily];
             set => this.Set((int)MsiPatchSequenceTupleFields.PatchFamily, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.ProductCode];
             set => this.Set((int)MsiPatchSequenceTupleFields.ProductCode, value);
         }
 
         public string Sequence
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.Sequence]?.Value;
+            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.Sequence];
             set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes];
             set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
index bcf32cb6..85484381 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
@@ -55,7 +55,7 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Name];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Name, value);
         }
 
@@ -85,31 +85,31 @@ namespace WixToolset.Data.Tuples
 
         public string RebootMessage
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.RebootMessage]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.RebootMessage];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.RebootMessage, value);
         }
 
         public string Command
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Command]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Command];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Command, value);
         }
 
         public string Actions
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Actions]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Actions];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Actions, value);
         }
 
         public string DelayActions
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.DelayActions]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.DelayActions];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Component_];
             set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
index c0e8e459..b0a58d9f 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
@@ -59,7 +59,7 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Name];
             set => this.Set((int)MsiServiceConfigTupleFields.Name, value);
         }
 
@@ -89,13 +89,13 @@ namespace WixToolset.Data.Tuples
 
         public string Argument
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Argument]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Argument];
             set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Component_];
             set => this.Set((int)MsiServiceConfigTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
index 9ee6b2f2..26ddbf4f 100644
--- a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string MsiShortcutProperty
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.MsiShortcutProperty]?.Value;
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.MsiShortcutProperty];
             set => this.Set((int)MsiShortcutPropertyTupleFields.MsiShortcutProperty, value);
         }
 
         public string Shortcut_
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_]?.Value;
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.Shortcut_];
             set => this.Set((int)MsiShortcutPropertyTupleFields.Shortcut_, value);
         }
 
         public string PropertyKey
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropertyKey]?.Value;
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropertyKey];
             set => this.Set((int)MsiShortcutPropertyTupleFields.PropertyKey, value);
         }
 
         public string PropVariantValue
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropVariantValue]?.Value;
+            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropVariantValue];
             set => this.Set((int)MsiShortcutPropertyTupleFields.PropVariantValue, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
index de4f88cd..293d5a62 100644
--- a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Driver_
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Driver_]?.Value;
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Driver_];
             set => this.Set((int)ODBCAttributeTupleFields.Driver_, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Attribute]?.Value;
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Attribute];
             set => this.Set((int)ODBCAttributeTupleFields.Attribute, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Value];
             set => this.Set((int)ODBCAttributeTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
index c06b2da0..ebf35895 100644
--- a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string DataSource
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DataSource]?.Value;
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DataSource];
             set => this.Set((int)ODBCDataSourceTupleFields.DataSource, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Component_];
             set => this.Set((int)ODBCDataSourceTupleFields.Component_, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Description];
             set => this.Set((int)ODBCDataSourceTupleFields.Description, value);
         }
 
         public string DriverDescription
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DriverDescription]?.Value;
+            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DriverDescription];
             set => this.Set((int)ODBCDataSourceTupleFields.DriverDescription, value);
         }
 
         public int Registration
         {
-            get => (int)this.Fields[(int)ODBCDataSourceTupleFields.Registration]?.Value;
+            get => (int)this.Fields[(int)ODBCDataSourceTupleFields.Registration];
             set => this.Set((int)ODBCDataSourceTupleFields.Registration, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
index ab40ee88..a35d62f4 100644
--- a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Driver
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.Driver]?.Value;
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Driver];
             set => this.Set((int)ODBCDriverTupleFields.Driver, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Component_];
             set => this.Set((int)ODBCDriverTupleFields.Component_, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.Description];
             set => this.Set((int)ODBCDriverTupleFields.Description, value);
         }
 
         public string File_
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_];
             set => this.Set((int)ODBCDriverTupleFields.File_, value);
         }
 
         public string File_Setup
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_Setup]?.Value;
+            get => (string)this.Fields[(int)ODBCDriverTupleFields.File_Setup];
             set => this.Set((int)ODBCDriverTupleFields.File_Setup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
index 541eb532..a69188a2 100644
--- a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string DataSource_
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSource_]?.Value;
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSource_];
             set => this.Set((int)ODBCSourceAttributeTupleFields.DataSource_, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Attribute]?.Value;
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Attribute];
             set => this.Set((int)ODBCSourceAttributeTupleFields.Attribute, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Value];
             set => this.Set((int)ODBCSourceAttributeTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
index ab1abbdc..678bac57 100644
--- a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Translator
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Translator]?.Value;
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Translator];
             set => this.Set((int)ODBCTranslatorTupleFields.Translator, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Component_];
             set => this.Set((int)ODBCTranslatorTupleFields.Component_, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Description];
             set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
         }
 
         public string File_
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_];
             set => this.Set((int)ODBCTranslatorTupleFields.File_, value);
         }
 
         public string File_Setup
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_Setup]?.Value;
+            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.File_Setup];
             set => this.Set((int)ODBCTranslatorTupleFields.File_Setup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
index d596e58e..df6962b3 100644
--- a/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string Company
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Company]?.Value;
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Company];
             set => this.Set((int)PatchMetadataTupleFields.Company, value);
         }
 
         public string Property
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Property];
             set => this.Set((int)PatchMetadataTupleFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)PatchMetadataTupleFields.Value];
             set => this.Set((int)PatchMetadataTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
index 276d00a2..36898c45 100644
--- a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string PatchId
         {
-            get => (string)this.Fields[(int)PatchPackageTupleFields.PatchId]?.Value;
+            get => (string)this.Fields[(int)PatchPackageTupleFields.PatchId];
             set => this.Set((int)PatchPackageTupleFields.PatchId, value);
         }
 
         public int Media_
         {
-            get => (int)this.Fields[(int)PatchPackageTupleFields.Media_]?.Value;
+            get => (int)this.Fields[(int)PatchPackageTupleFields.Media_];
             set => this.Set((int)PatchPackageTupleFields.Media_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
index 624054c1..857e8d6e 100644
--- a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string PatchFamily
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.PatchFamily]?.Value;
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.PatchFamily];
             set => this.Set((int)PatchSequenceTupleFields.PatchFamily, value);
         }
 
         public string Target
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.Target]?.Value;
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.Target];
             set => this.Set((int)PatchSequenceTupleFields.Target, value);
         }
 
         public string Sequence
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.Sequence]?.Value;
+            get => (string)this.Fields[(int)PatchSequenceTupleFields.Sequence];
             set => this.Set((int)PatchSequenceTupleFields.Sequence, value);
         }
 
         public int Supersede
         {
-            get => (int)this.Fields[(int)PatchSequenceTupleFields.Supersede]?.Value;
+            get => (int)this.Fields[(int)PatchSequenceTupleFields.Supersede];
             set => this.Set((int)PatchSequenceTupleFields.Supersede, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PatchTuple.cs b/src/WixToolset.Data/Tuples/PatchTuple.cs
index 268307c7..ca313410 100644
--- a/src/WixToolset.Data/Tuples/PatchTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)PatchTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)PatchTupleFields.File_];
             set => this.Set((int)PatchTupleFields.File_, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)PatchTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)PatchTupleFields.Sequence];
             set => this.Set((int)PatchTupleFields.Sequence, value);
         }
 
         public int PatchSize
         {
-            get => (int)this.Fields[(int)PatchTupleFields.PatchSize]?.Value;
+            get => (int)this.Fields[(int)PatchTupleFields.PatchSize];
             set => this.Set((int)PatchTupleFields.PatchSize, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)PatchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)PatchTupleFields.Attributes];
             set => this.Set((int)PatchTupleFields.Attributes, value);
         }
 
         public string Header
         {
-            get => (string)this.Fields[(int)PatchTupleFields.Header]?.Value;
+            get => (string)this.Fields[(int)PatchTupleFields.Header];
             set => this.Set((int)PatchTupleFields.Header, value);
         }
 
         public string StreamRef_
         {
-            get => (string)this.Fields[(int)PatchTupleFields.StreamRef_]?.Value;
+            get => (string)this.Fields[(int)PatchTupleFields.StreamRef_];
             set => this.Set((int)PatchTupleFields.StreamRef_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ProgIdTuple.cs b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
index a1713392..9275e6aa 100644
--- a/src/WixToolset.Data/Tuples/ProgIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string ProgId
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId]?.Value;
+            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId];
             set => this.Set((int)ProgIdTupleFields.ProgId, value);
         }
 
         public string ProgId_Parent
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId_Parent]?.Value;
+            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId_Parent];
             set => this.Set((int)ProgIdTupleFields.ProgId_Parent, value);
         }
 
         public string Class_
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Class_]?.Value;
+            get => (string)this.Fields[(int)ProgIdTupleFields.Class_];
             set => this.Set((int)ProgIdTupleFields.Class_, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ProgIdTupleFields.Description];
             set => this.Set((int)ProgIdTupleFields.Description, value);
         }
 
         public string Icon_
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Icon_]?.Value;
+            get => (string)this.Fields[(int)ProgIdTupleFields.Icon_];
             set => this.Set((int)ProgIdTupleFields.Icon_, value);
         }
 
         public int IconIndex
         {
-            get => (int)this.Fields[(int)ProgIdTupleFields.IconIndex]?.Value;
+            get => (int)this.Fields[(int)ProgIdTupleFields.IconIndex];
             set => this.Set((int)ProgIdTupleFields.IconIndex, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PropertiesTuple.cs b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
index 6aafaa51..aaccaa81 100644
--- a/src/WixToolset.Data/Tuples/PropertiesTuple.cs
+++ b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)PropertiesTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)PropertiesTupleFields.Name];
             set => this.Set((int)PropertiesTupleFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)PropertiesTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)PropertiesTupleFields.Value];
             set => this.Set((int)PropertiesTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
index d17da1bb..b3cd766e 100644
--- a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentId]?.Value;
+            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentId];
             set => this.Set((int)PublishComponentTupleFields.ComponentId, value);
         }
 
         public string Qualifier
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Qualifier]?.Value;
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Qualifier];
             set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Component_];
             set => this.Set((int)PublishComponentTupleFields.Component_, value);
         }
 
         public string AppData
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.AppData]?.Value;
+            get => (string)this.Fields[(int)PublishComponentTupleFields.AppData];
             set => this.Set((int)PublishComponentTupleFields.AppData, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)PublishComponentTupleFields.Feature_];
             set => this.Set((int)PublishComponentTupleFields.Feature_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RadioButtonTuple.cs b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
index 420577dc..2fea402a 100644
--- a/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
+++ b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
@@ -53,55 +53,55 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Property];
             set => this.Set((int)RadioButtonTupleFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Order];
             set => this.Set((int)RadioButtonTupleFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Value];
             set => this.Set((int)RadioButtonTupleFields.Value, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.X]?.Value;
+            get => (int)this.Fields[(int)RadioButtonTupleFields.X];
             set => this.Set((int)RadioButtonTupleFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Y]?.Value;
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Y];
             set => this.Set((int)RadioButtonTupleFields.Y, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Width]?.Value;
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Width];
             set => this.Set((int)RadioButtonTupleFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Height]?.Value;
+            get => (int)this.Fields[(int)RadioButtonTupleFields.Height];
             set => this.Set((int)RadioButtonTupleFields.Height, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Text];
             set => this.Set((int)RadioButtonTupleFields.Text, value);
         }
 
         public string Help
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Help]?.Value;
+            get => (string)this.Fields[(int)RadioButtonTupleFields.Help];
             set => this.Set((int)RadioButtonTupleFields.Help, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RegLocatorTuple.cs b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
index b098e687..f8edad95 100644
--- a/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Signature_
         {
-            get => (string)this.Fields[(int)RegLocatorTupleFields.Signature_]?.Value;
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Signature_];
             set => this.Set((int)RegLocatorTupleFields.Signature_, value);
         }
 
         public int Root
         {
-            get => (int)this.Fields[(int)RegLocatorTupleFields.Root]?.Value;
+            get => (int)this.Fields[(int)RegLocatorTupleFields.Root];
             set => this.Set((int)RegLocatorTupleFields.Root, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)RegLocatorTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Key];
             set => this.Set((int)RegLocatorTupleFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RegLocatorTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)RegLocatorTupleFields.Name];
             set => this.Set((int)RegLocatorTupleFields.Name, value);
         }
 
         public int Type
         {
-            get => (int)this.Fields[(int)RegLocatorTupleFields.Type]?.Value;
+            get => (int)this.Fields[(int)RegLocatorTupleFields.Type];
             set => this.Set((int)RegLocatorTupleFields.Type, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RegistryTuple.cs b/src/WixToolset.Data/Tuples/RegistryTuple.cs
index d76de213..adb00f49 100644
--- a/src/WixToolset.Data/Tuples/RegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RegistryTuple.cs
@@ -71,13 +71,13 @@ namespace WixToolset.Data.Tuples
 
         public string Key
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)RegistryTupleFields.Key];
             set => this.Set((int)RegistryTupleFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)RegistryTupleFields.Name];
             set => this.Set((int)RegistryTupleFields.Name, value);
         }
 
@@ -101,7 +101,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)RegistryTupleFields.Component_];
             set => this.Set((int)RegistryTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
index 1860172f..1f370ae9 100644
--- a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string FileKey
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.FileKey]?.Value;
+            get => (string)this.Fields[(int)RemoveFileTupleFields.FileKey];
             set => this.Set((int)RemoveFileTupleFields.FileKey, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)RemoveFileTupleFields.Component_];
             set => this.Set((int)RemoveFileTupleFields.Component_, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)RemoveFileTupleFields.FileName];
             set => this.Set((int)RemoveFileTupleFields.FileName, value);
         }
 
         public string DirProperty
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.DirProperty]?.Value;
+            get => (string)this.Fields[(int)RemoveFileTupleFields.DirProperty];
             set => this.Set((int)RemoveFileTupleFields.DirProperty, value);
         }
 
         public int InstallMode
         {
-            get => (int)this.Fields[(int)RemoveFileTupleFields.InstallMode]?.Value;
+            get => (int)this.Fields[(int)RemoveFileTupleFields.InstallMode];
             set => this.Set((int)RemoveFileTupleFields.InstallMode, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
index e2e79560..69990a31 100644
--- a/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveIniFileTuple.cs
@@ -51,49 +51,49 @@ namespace WixToolset.Data.Tuples
 
         public string RemoveIniFile
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.RemoveIniFile]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.RemoveIniFile];
             set => this.Set((int)RemoveIniFileTupleFields.RemoveIniFile, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.FileName];
             set => this.Set((int)RemoveIniFileTupleFields.FileName, value);
         }
 
         public string DirProperty
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.DirProperty]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.DirProperty];
             set => this.Set((int)RemoveIniFileTupleFields.DirProperty, value);
         }
 
         public string Section
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Section]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Section];
             set => this.Set((int)RemoveIniFileTupleFields.Section, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Key];
             set => this.Set((int)RemoveIniFileTupleFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Value];
             set => this.Set((int)RemoveIniFileTupleFields.Value, value);
         }
 
         public int Action
         {
-            get => (int)this.Fields[(int)RemoveIniFileTupleFields.Action]?.Value;
+            get => (int)this.Fields[(int)RemoveIniFileTupleFields.Action];
             set => this.Set((int)RemoveIniFileTupleFields.Action, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)RemoveIniFileTupleFields.Component_];
             set => this.Set((int)RemoveIniFileTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
index e3552d10..de13cdb0 100644
--- a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
@@ -57,13 +57,13 @@ namespace WixToolset.Data.Tuples
 
         public string Key
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Key];
             set => this.Set((int)RemoveRegistryTupleFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Name];
             set => this.Set((int)RemoveRegistryTupleFields.Name, value);
         }
 
@@ -75,7 +75,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Component_];
             set => this.Set((int)RemoveRegistryTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
index 769ac4b2..8804cf3c 100644
--- a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+++ b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string ReserveKey
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveKey]?.Value;
+            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveKey];
             set => this.Set((int)ReserveCostTupleFields.ReserveKey, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ReserveCostTupleFields.Component_];
             set => this.Set((int)ReserveCostTupleFields.Component_, value);
         }
 
         public string ReserveFolder
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveFolder]?.Value;
+            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveFolder];
             set => this.Set((int)ReserveCostTupleFields.ReserveFolder, value);
         }
 
         public int ReserveLocal
         {
-            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveLocal]?.Value;
+            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveLocal];
             set => this.Set((int)ReserveCostTupleFields.ReserveLocal, value);
         }
 
         public int ReserveSource
         {
-            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveSource]?.Value;
+            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveSource];
             set => this.Set((int)ReserveCostTupleFields.ReserveSource, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
index 5db5f984..e80b5cf5 100644
--- a/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string SFPCatalog
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.SFPCatalog]?.Value;
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.SFPCatalog];
             set => this.Set((int)SFPCatalogTupleFields.SFPCatalog, value);
         }
 
         public string Catalog
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.Catalog]?.Value;
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.Catalog];
             set => this.Set((int)SFPCatalogTupleFields.Catalog, value);
         }
 
         public string Dependency
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.Dependency]?.Value;
+            get => (string)this.Fields[(int)SFPCatalogTupleFields.Dependency];
             set => this.Set((int)SFPCatalogTupleFields.Dependency, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/SelfRegTuple.cs b/src/WixToolset.Data/Tuples/SelfRegTuple.cs
index b32127f3..0ea1eeac 100644
--- a/src/WixToolset.Data/Tuples/SelfRegTuple.cs
+++ b/src/WixToolset.Data/Tuples/SelfRegTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)SelfRegTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)SelfRegTupleFields.File_];
             set => this.Set((int)SelfRegTupleFields.File_, value);
         }
 
         public int Cost
         {
-            get => (int)this.Fields[(int)SelfRegTupleFields.Cost]?.Value;
+            get => (int)this.Fields[(int)SelfRegTupleFields.Cost];
             set => this.Set((int)SelfRegTupleFields.Cost, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
index 844ee864..6d57120a 100644
--- a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
@@ -57,13 +57,13 @@ namespace WixToolset.Data.Tuples
 
         public string ServiceControl
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.ServiceControl]?.Value;
+            get => (string)this.Fields[(int)ServiceControlTupleFields.ServiceControl];
             set => this.Set((int)ServiceControlTupleFields.ServiceControl, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Name];
             set => this.Set((int)ServiceControlTupleFields.Name, value);
         }
 
@@ -105,7 +105,7 @@ namespace WixToolset.Data.Tuples
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Arguments]?.Value;
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Arguments];
             set => this.Set((int)ServiceControlTupleFields.Arguments, value);
         }
 
@@ -117,7 +117,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ServiceControlTupleFields.Component_];
             set => this.Set((int)ServiceControlTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
index 987dccd7..a055e46e 100644
--- a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
@@ -88,13 +88,13 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Name];
             set => this.Set((int)ServiceInstallTupleFields.Name, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.DisplayName];
             set => this.Set((int)ServiceInstallTupleFields.DisplayName, value);
         }
 
@@ -118,43 +118,43 @@ namespace WixToolset.Data.Tuples
 
         public string LoadOrderGroup
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.LoadOrderGroup]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.LoadOrderGroup];
             set => this.Set((int)ServiceInstallTupleFields.LoadOrderGroup, value);
         }
 
         public string Dependencies
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Dependencies]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Dependencies];
             set => this.Set((int)ServiceInstallTupleFields.Dependencies, value);
         }
 
         public string StartName
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.StartName]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.StartName];
             set => this.Set((int)ServiceInstallTupleFields.StartName, value);
         }
 
         public string Password
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Password]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Password];
             set => this.Set((int)ServiceInstallTupleFields.Password, value);
         }
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Arguments]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Arguments];
             set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Component_];
             set => this.Set((int)ServiceInstallTupleFields.Component_, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ServiceInstallTupleFields.Description];
             set => this.Set((int)ServiceInstallTupleFields.Description, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/ShortcutTuple.cs b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
index b7f13416..b58bfd8e 100644
--- a/src/WixToolset.Data/Tuples/ShortcutTuple.cs
+++ b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
@@ -72,37 +72,37 @@ namespace WixToolset.Data.Tuples
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Directory_];
             set => this.Set((int)ShortcutTupleFields.Directory_, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Name];
             set => this.Set((int)ShortcutTupleFields.Name, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Component_];
             set => this.Set((int)ShortcutTupleFields.Component_, value);
         }
 
         public string Target
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Target]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Target];
             set => this.Set((int)ShortcutTupleFields.Target, value);
         }
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Arguments]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Arguments];
             set => this.Set((int)ShortcutTupleFields.Arguments, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Description];
             set => this.Set((int)ShortcutTupleFields.Description, value);
         }
 
@@ -114,7 +114,7 @@ namespace WixToolset.Data.Tuples
 
         public string Icon_
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Icon_]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.Icon_];
             set => this.Set((int)ShortcutTupleFields.Icon_, value);
         }
 
@@ -132,13 +132,13 @@ namespace WixToolset.Data.Tuples
 
         public string WorkingDirectory
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.WkDir]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.WkDir];
             set => this.Set((int)ShortcutTupleFields.WkDir, value);
         }
 
         public string DisplayResourceDll
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.DisplayResourceDLL]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.DisplayResourceDLL];
             set => this.Set((int)ShortcutTupleFields.DisplayResourceDLL, value);
         }
 
@@ -150,7 +150,7 @@ namespace WixToolset.Data.Tuples
 
         public string DescriptionResourceDll
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.DescriptionResourceDLL]?.Value;
+            get => (string)this.Fields[(int)ShortcutTupleFields.DescriptionResourceDLL];
             set => this.Set((int)ShortcutTupleFields.DescriptionResourceDLL, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/SignatureTuple.cs b/src/WixToolset.Data/Tuples/SignatureTuple.cs
index b8dbf308..59c40d99 100644
--- a/src/WixToolset.Data/Tuples/SignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/SignatureTuple.cs
@@ -53,55 +53,55 @@ namespace WixToolset.Data.Tuples
 
         public string Signature
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.Signature]?.Value;
+            get => (string)this.Fields[(int)SignatureTupleFields.Signature];
             set => this.Set((int)SignatureTupleFields.Signature, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.FileName]?.Value;
+            get => (string)this.Fields[(int)SignatureTupleFields.FileName];
             set => this.Set((int)SignatureTupleFields.FileName, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.MinVersion]?.Value;
+            get => (string)this.Fields[(int)SignatureTupleFields.MinVersion];
             set => this.Set((int)SignatureTupleFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.MaxVersion]?.Value;
+            get => (string)this.Fields[(int)SignatureTupleFields.MaxVersion];
             set => this.Set((int)SignatureTupleFields.MaxVersion, value);
         }
 
         public int MinSize
         {
-            get => (int)this.Fields[(int)SignatureTupleFields.MinSize]?.Value;
+            get => (int)this.Fields[(int)SignatureTupleFields.MinSize];
             set => this.Set((int)SignatureTupleFields.MinSize, value);
         }
 
         public int MaxSize
         {
-            get => (int)this.Fields[(int)SignatureTupleFields.MaxSize]?.Value;
+            get => (int)this.Fields[(int)SignatureTupleFields.MaxSize];
             set => this.Set((int)SignatureTupleFields.MaxSize, value);
         }
 
         public int MinDate
         {
-            get => (int)this.Fields[(int)SignatureTupleFields.MinDate]?.Value;
+            get => (int)this.Fields[(int)SignatureTupleFields.MinDate];
             set => this.Set((int)SignatureTupleFields.MinDate, value);
         }
 
         public int MaxDate
         {
-            get => (int)this.Fields[(int)SignatureTupleFields.MaxDate]?.Value;
+            get => (int)this.Fields[(int)SignatureTupleFields.MaxDate];
             set => this.Set((int)SignatureTupleFields.MaxDate, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.Languages]?.Value;
+            get => (string)this.Fields[(int)SignatureTupleFields.Languages];
             set => this.Set((int)SignatureTupleFields.Languages, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
index 449c4afe..d8fd5b85 100644
--- a/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
+++ b/src/WixToolset.Data/Tuples/TargetFiles_OptionalDataTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string Target
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.Target]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.Target];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.Target, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.FTK]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.FTK];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.FTK, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.SymbolPaths];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.SymbolPaths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreLengths]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.IgnoreLengths];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.RetainOffsets]?.Value;
+            get => (string)this.Fields[(int)TargetFiles_OptionalDataTupleFields.RetainOffsets];
             set => this.Set((int)TargetFiles_OptionalDataTupleFields.RetainOffsets, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/TargetImagesTuple.cs b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
index 0cb74ec9..0dc1d4de 100644
--- a/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
+++ b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
@@ -49,43 +49,43 @@ namespace WixToolset.Data.Tuples
 
         public string Target
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.Target]?.Value;
+            get => (string)this.Fields[(int)TargetImagesTupleFields.Target];
             set => this.Set((int)TargetImagesTupleFields.Target, value);
         }
 
         public string MsiPath
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.MsiPath]?.Value;
+            get => (string)this.Fields[(int)TargetImagesTupleFields.MsiPath];
             set => this.Set((int)TargetImagesTupleFields.MsiPath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)TargetImagesTupleFields.SymbolPaths];
             set => this.Set((int)TargetImagesTupleFields.SymbolPaths, value);
         }
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.Upgraded]?.Value;
+            get => (string)this.Fields[(int)TargetImagesTupleFields.Upgraded];
             set => this.Set((int)TargetImagesTupleFields.Upgraded, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)TargetImagesTupleFields.Order]?.Value;
+            get => (int)this.Fields[(int)TargetImagesTupleFields.Order];
             set => this.Set((int)TargetImagesTupleFields.Order, value);
         }
 
         public string ProductValidateFlags
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.ProductValidateFlags]?.Value;
+            get => (string)this.Fields[(int)TargetImagesTupleFields.ProductValidateFlags];
             set => this.Set((int)TargetImagesTupleFields.ProductValidateFlags, value);
         }
 
         public int IgnoreMissingSrcFiles
         {
-            get => (int)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles]?.Value;
+            get => (int)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles];
             set => this.Set((int)TargetImagesTupleFields.IgnoreMissingSrcFiles, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/TextStyleTuple.cs b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
index d39b40e9..e4929ccf 100644
--- a/src/WixToolset.Data/Tuples/TextStyleTuple.cs
+++ b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
@@ -51,13 +51,13 @@ namespace WixToolset.Data.Tuples
 
         public string TextStyle
         {
-            get => (string)this.Fields[(int)TextStyleTupleFields.TextStyle]?.Value;
+            get => (string)this.Fields[(int)TextStyleTupleFields.TextStyle];
             set => this.Set((int)TextStyleTupleFields.TextStyle, value);
         }
 
         public string FaceName
         {
-            get => (string)this.Fields[(int)TextStyleTupleFields.FaceName]?.Value;
+            get => (string)this.Fields[(int)TextStyleTupleFields.FaceName];
             set => this.Set((int)TextStyleTupleFields.FaceName, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/TypeLibTuple.cs b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
index 7bd26bf3..de2a8823 100644
--- a/src/WixToolset.Data/Tuples/TypeLibTuple.cs
+++ b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
@@ -51,49 +51,49 @@ namespace WixToolset.Data.Tuples
 
         public string LibID
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.LibID]?.Value;
+            get => (string)this.Fields[(int)TypeLibTupleFields.LibID];
             set => this.Set((int)TypeLibTupleFields.LibID, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)TypeLibTupleFields.Language]?.Value;
+            get => (int)this.Fields[(int)TypeLibTupleFields.Language];
             set => this.Set((int)TypeLibTupleFields.Language, value);
         }
 
         public string Component_
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)TypeLibTupleFields.Component_];
             set => this.Set((int)TypeLibTupleFields.Component_, value);
         }
 
         public int Version
         {
-            get => (int)this.Fields[(int)TypeLibTupleFields.Version]?.Value;
+            get => (int)this.Fields[(int)TypeLibTupleFields.Version];
             set => this.Set((int)TypeLibTupleFields.Version, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)TypeLibTupleFields.Description];
             set => this.Set((int)TypeLibTupleFields.Description, value);
         }
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)TypeLibTupleFields.Directory_];
             set => this.Set((int)TypeLibTupleFields.Directory_, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)TypeLibTupleFields.Feature_];
             set => this.Set((int)TypeLibTupleFields.Feature_, value);
         }
 
         public int Cost
         {
-            get => (int)this.Fields[(int)TypeLibTupleFields.Cost]?.Value;
+            get => (int)this.Fields[(int)TypeLibTupleFields.Cost];
             set => this.Set((int)TypeLibTupleFields.Cost, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/UITextTuple.cs b/src/WixToolset.Data/Tuples/UITextTuple.cs
index 3d5f2933..b6356b99 100644
--- a/src/WixToolset.Data/Tuples/UITextTuple.cs
+++ b/src/WixToolset.Data/Tuples/UITextTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Key
         {
-            get => (string)this.Fields[(int)UITextTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)UITextTupleFields.Key];
             set => this.Set((int)UITextTupleFields.Key, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)UITextTupleFields.Text]?.Value;
+            get => (string)this.Fields[(int)UITextTupleFields.Text];
             set => this.Set((int)UITextTupleFields.Text, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/UpgradeTuple.cs b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
index efb34733..03e5edd2 100644
--- a/src/WixToolset.Data/Tuples/UpgradeTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
@@ -59,25 +59,25 @@ namespace WixToolset.Data.Tuples
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.UpgradeCode];
             set => this.Set((int)UpgradeTupleFields.UpgradeCode, value);
         }
 
         public string VersionMin
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMin]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMin];
             set => this.Set((int)UpgradeTupleFields.VersionMin, value);
         }
 
         public string VersionMax
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMax]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMax];
             set => this.Set((int)UpgradeTupleFields.VersionMax, value);
         }
 
         public string Language
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.Language]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.Language];
             set => this.Set((int)UpgradeTupleFields.Language, value);
         }
 
@@ -119,13 +119,13 @@ namespace WixToolset.Data.Tuples
 
         public string Remove
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.Remove]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.Remove];
             set => this.Set((int)UpgradeTupleFields.Remove, value);
         }
 
         public string ActionProperty
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.ActionProperty]?.Value;
+            get => (string)this.Fields[(int)UpgradeTupleFields.ActionProperty];
             set => this.Set((int)UpgradeTupleFields.ActionProperty, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
index 64ec9229..95617c6f 100644
--- a/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.Upgraded]?.Value;
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.Upgraded];
             set => this.Set((int)UpgradedFilesToIgnoreTupleFields.Upgraded, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.FTK]?.Value;
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.FTK];
             set => this.Set((int)UpgradedFilesToIgnoreTupleFields.FTK, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
index 09b93fed..9e764adf 100644
--- a/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedFiles_OptionalDataTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.Upgraded]?.Value;
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.Upgraded];
             set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.Upgraded, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.FTK]?.Value;
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.FTK];
             set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.FTK, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths];
             set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.SymbolPaths, value);
         }
 
         public int AllowIgnoreOnPatchError
         {
-            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError]?.Value;
+            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError];
             set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.AllowIgnoreOnPatchError, value);
         }
 
         public int IncludeWholeFile
         {
-            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile]?.Value;
+            get => (int)this.Fields[(int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile];
             set => this.Set((int)UpgradedFiles_OptionalDataTupleFields.IncludeWholeFile, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
index 32170467..856c27e2 100644
--- a/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Upgraded]?.Value;
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Upgraded];
             set => this.Set((int)UpgradedImagesTupleFields.Upgraded, value);
         }
 
         public string MsiPath
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.MsiPath]?.Value;
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.MsiPath];
             set => this.Set((int)UpgradedImagesTupleFields.MsiPath, value);
         }
 
         public string PatchMsiPath
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.PatchMsiPath]?.Value;
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.PatchMsiPath];
             set => this.Set((int)UpgradedImagesTupleFields.PatchMsiPath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.SymbolPaths];
             set => this.Set((int)UpgradedImagesTupleFields.SymbolPaths, value);
         }
 
         public string Family
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Family]?.Value;
+            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Family];
             set => this.Set((int)UpgradedImagesTupleFields.Family, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/VerbTuple.cs b/src/WixToolset.Data/Tuples/VerbTuple.cs
index 4d5c7c03..a9e9c245 100644
--- a/src/WixToolset.Data/Tuples/VerbTuple.cs
+++ b/src/WixToolset.Data/Tuples/VerbTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Extension_
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Extension_]?.Value;
+            get => (string)this.Fields[(int)VerbTupleFields.Extension_];
             set => this.Set((int)VerbTupleFields.Extension_, value);
         }
 
         public string Verb
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Verb]?.Value;
+            get => (string)this.Fields[(int)VerbTupleFields.Verb];
             set => this.Set((int)VerbTupleFields.Verb, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)VerbTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)VerbTupleFields.Sequence];
             set => this.Set((int)VerbTupleFields.Sequence, value);
         }
 
         public string Command
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Command]?.Value;
+            get => (string)this.Fields[(int)VerbTupleFields.Command];
             set => this.Set((int)VerbTupleFields.Command, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Argument]?.Value;
+            get => (string)this.Fields[(int)VerbTupleFields.Argument];
             set => this.Set((int)VerbTupleFields.Argument, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixActionTuple.cs b/src/WixToolset.Data/Tuples/WixActionTuple.cs
index d196e560..148f28d9 100644
--- a/src/WixToolset.Data/Tuples/WixActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixActionTuple.cs
@@ -60,37 +60,37 @@ namespace WixToolset.Data.Tuples
 
         public SequenceTable SequenceTable
         {
-            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixActionTupleFields.SequenceTable]?.Value);
+            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixActionTupleFields.SequenceTable]);
             set => this.Set((int)WixActionTupleFields.SequenceTable, value.ToString());
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)WixActionTupleFields.Action];
             set => this.Set((int)WixActionTupleFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)WixActionTupleFields.Condition];
             set => this.Set((int)WixActionTupleFields.Condition, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)WixActionTupleFields.Sequence]?.Value;
+            get => (int)this.Fields[(int)WixActionTupleFields.Sequence];
             set => this.Set((int)WixActionTupleFields.Sequence, value);
         }
 
         public string Before
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Before]?.Value;
+            get => (string)this.Fields[(int)WixActionTupleFields.Before];
             set => this.Set((int)WixActionTupleFields.Before, value);
         }
 
         public string After
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.After]?.Value;
+            get => (string)this.Fields[(int)WixActionTupleFields.After];
             set => this.Set((int)WixActionTupleFields.After, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
index e733e6ab..8916cdfc 100644
--- a/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Id];
             set => this.Set((int)WixApprovedExeForElevationTupleFields.Id, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key];
             set => this.Set((int)WixApprovedExeForElevationTupleFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Value];
             set => this.Set((int)WixApprovedExeForElevationTupleFields.Value, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes];
             set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
index 16a2a972..7df69426 100644
--- a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.File_];
             set => this.Set((int)WixBindUpdatedFilesTupleFields.File_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
index 00bf9dae..e80d6321 100644
--- a/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixBootstrapperApplicationTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixBootstrapperApplicationTupleFields.Id];
             set => this.Set((int)WixBootstrapperApplicationTupleFields.Id, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
index d71cbbaf..9abb999b 100644
--- a/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string WixVersion
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixVersion]?.Value;
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixVersion];
             set => this.Set((int)WixBuildInfoTupleFields.WixVersion, value);
         }
 
         public string WixOutputFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixOutputFile]?.Value;
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixOutputFile];
             set => this.Set((int)WixBuildInfoTupleFields.WixOutputFile, value);
         }
 
         public string WixProjectFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixProjectFile]?.Value;
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixProjectFile];
             set => this.Set((int)WixBuildInfoTupleFields.WixProjectFile, value);
         }
 
         public string WixPdbFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixPdbFile]?.Value;
+            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixPdbFile];
             set => this.Set((int)WixBuildInfoTupleFields.WixPdbFile, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
index 4a4cd372..840cc65d 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundleCatalog
         {
-            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.WixBundleCatalog]?.Value;
+            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.WixBundleCatalog];
             set => this.Set((int)WixBundleCatalogTupleFields.WixBundleCatalog, value);
         }
 
         public string Payload_
         {
-            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.Payload_]?.Value;
+            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.Payload_];
             set => this.Set((int)WixBundleCatalogTupleFields.Payload_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
index d06e029f..c9d8e12f 100644
--- a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
@@ -62,49 +62,49 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundleContainer
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WixBundleContainer]?.Value;
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WixBundleContainer];
             set => this.Set((int)WixBundleContainerTupleFields.WixBundleContainer, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name];
             set => this.Set((int)WixBundleContainerTupleFields.Name, value);
         }
 
         public ContainerType Type
         {
-            get => (ContainerType)Enum.Parse(typeof(ContainerType), (string)this.Fields[(int)WixBundleContainerTupleFields.Type]?.Value, true);
+            get => (ContainerType)Enum.Parse(typeof(ContainerType), (string)this.Fields[(int)WixBundleContainerTupleFields.Type], true);
             set => this.Set((int)WixBundleContainerTupleFields.Type, value.ToString());
         }
 
         public string DownloadUrl
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.DownloadUrl]?.Value;
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.DownloadUrl];
             set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
         }
 
         public int Size
         {
-            get => (int)this.Fields[(int)WixBundleContainerTupleFields.Size]?.Value;
+            get => (int)this.Fields[(int)WixBundleContainerTupleFields.Size];
             set => this.Set((int)WixBundleContainerTupleFields.Size, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Hash]?.Value;
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Hash];
             set => this.Set((int)WixBundleContainerTupleFields.Hash, value);
         }
 
         public int AttachedContainerIndex
         {
-            get => (int)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex]?.Value;
+            get => (int)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex];
             set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value);
         }
 
         public string WorkingPath
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WorkingPath]?.Value;
+            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WorkingPath];
             set => this.Set((int)WixBundleContainerTupleFields.WorkingPath, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
index 7ba036f3..bc2f42e1 100644
--- a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
@@ -57,43 +57,43 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleExePackageTupleFields.WixBundlePackage_, value);
         }
 
         public WixBundleExePackageAttributes Attributes
         {
-            get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageTupleFields.Attributes]?.Value;
+            get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageTupleFields.Attributes];
             set => this.Set((int)WixBundleExePackageTupleFields.Attributes, (int)value);
         }
 
         public string DetectCondition
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.DetectCondition]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.DetectCondition];
             set => this.Set((int)WixBundleExePackageTupleFields.DetectCondition, value);
         }
 
         public string InstallCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.InstallCommand]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.InstallCommand];
             set => this.Set((int)WixBundleExePackageTupleFields.InstallCommand, value);
         }
 
         public string RepairCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.RepairCommand]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.RepairCommand];
             set => this.Set((int)WixBundleExePackageTupleFields.RepairCommand, value);
         }
 
         public string UninstallCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.UninstallCommand]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.UninstallCommand];
             set => this.Set((int)WixBundleExePackageTupleFields.UninstallCommand, value);
         }
 
         public string ExeProtocol
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.ExeProtocol]?.Value;
+            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.ExeProtocol];
             set => this.Set((int)WixBundleExePackageTupleFields.ExeProtocol, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
index 2729205d..ebd8461e 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
@@ -55,61 +55,61 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.WixBundlePackage_, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Name];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Name, value);
         }
 
         public int Size
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Size]?.Value;
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Size];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Size, value);
         }
 
         public string Parent
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Parent]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Parent];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Parent, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Title]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Title];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Title, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Description];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Description, value);
         }
 
         public int Display
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Display]?.Value;
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Display];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Display, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Level]?.Value;
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Level];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Level, value);
         }
 
         public string Directory
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Directory]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Directory];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Directory, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Attributes];
             set => this.Set((int)WixBundleMsiFeatureTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
index ce3afc15..e8af4066 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
@@ -62,49 +62,49 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleMsiPackageTupleFields.WixBundlePackage_, value);
         }
 
         public WixBundleMsiPackageAttributes Attributes
         {
-            get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageTupleFields.Attributes]?.Value;
+            get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageTupleFields.Attributes];
             set => this.Set((int)WixBundleMsiPackageTupleFields.Attributes, (int)value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductCode];
             set => this.Set((int)WixBundleMsiPackageTupleFields.ProductCode, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.UpgradeCode];
             set => this.Set((int)WixBundleMsiPackageTupleFields.UpgradeCode, value);
         }
 
         public string ProductVersion
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductVersion]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductVersion];
             set => this.Set((int)WixBundleMsiPackageTupleFields.ProductVersion, value);
         }
 
         public int ProductLanguage
         {
-            get => (int)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductLanguage]?.Value;
+            get => (int)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductLanguage];
             set => this.Set((int)WixBundleMsiPackageTupleFields.ProductLanguage, value);
         }
 
         public string ProductName
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductName]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductName];
             set => this.Set((int)WixBundleMsiPackageTupleFields.ProductName, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.Manufacturer]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.Manufacturer];
             set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
index 5eea57ea..a788f034 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleMsiPropertyTupleFields.WixBundlePackage_, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Name];
             set => this.Set((int)WixBundleMsiPropertyTupleFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Value];
             set => this.Set((int)WixBundleMsiPropertyTupleFields.Value, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Condition];
             set => this.Set((int)WixBundleMsiPropertyTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
index 219c7735..ae233458 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
@@ -55,31 +55,31 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleMspPackageTupleFields.WixBundlePackage_, value);
         }
 
         public WixBundleMspPackageAttributes Attributes
         {
-            get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageTupleFields.Attributes]?.Value;
+            get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageTupleFields.Attributes];
             set => this.Set((int)WixBundleMspPackageTupleFields.Attributes, (int)value);
         }
 
         public string PatchCode
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchCode]?.Value;
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchCode];
             set => this.Set((int)WixBundleMspPackageTupleFields.PatchCode, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.Manufacturer]?.Value;
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.Manufacturer];
             set => this.Set((int)WixBundleMspPackageTupleFields.Manufacturer, value);
         }
 
         public string PatchXml
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchXml]?.Value;
+            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchXml];
             set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
index f6f71d6d..df8ab694 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleMsuPackageTupleFields.WixBundlePackage_, value);
         }
 
         public string DetectCondition
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.DetectCondition]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.DetectCondition];
             set => this.Set((int)WixBundleMsuPackageTupleFields.DetectCondition, value);
         }
 
         public string MsuKB
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.MsuKB]?.Value;
+            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.MsuKB];
             set => this.Set((int)WixBundleMsuPackageTupleFields.MsuKB, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
index 0ca895c0..3c2b5652 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackage_, value);
         }
 
         public string InstallArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.InstallArgument]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.InstallArgument];
             set => this.Set((int)WixBundlePackageCommandLineTupleFields.InstallArgument, value);
         }
 
         public string UninstallArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.UninstallArgument]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.UninstallArgument];
             set => this.Set((int)WixBundlePackageCommandLineTupleFields.UninstallArgument, value);
         }
 
         public string RepairArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.RepairArgument]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.RepairArgument];
             set => this.Set((int)WixBundlePackageCommandLineTupleFields.RepairArgument, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.Condition];
             set => this.Set((int)WixBundlePackageCommandLineTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
index 64c91316..880f1f73 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
@@ -52,19 +52,19 @@ namespace WixToolset.Data.Tuples
 
         public string ChainPackageId
         {
-            get => (string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.ChainPackageId]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.ChainPackageId];
             set => this.Set((int)WixBundlePackageExitCodeTupleFields.ChainPackageId, value);
         }
 
         public int Code
         {
-            get => (int)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Code]?.Value;
+            get => (int)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Code];
             set => this.Set((int)WixBundlePackageExitCodeTupleFields.Code, value);
         }
 
         public ExitCodeBehaviorType Behavior
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Behavior]?.Value, true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Behavior], true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
             set => this.Set((int)WixBundlePackageExitCodeTupleFields.Behavior, value.ToString());
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
index 56711155..61084c88 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackageGroup
         {
-            get => (string)this.Fields[(int)WixBundlePackageGroupTupleFields.WixBundlePackageGroup]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageGroupTupleFields.WixBundlePackageGroup];
             set => this.Set((int)WixBundlePackageGroupTupleFields.WixBundlePackageGroup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
index c7dcf373..c9f69ef3 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
@@ -95,121 +95,121 @@ namespace WixToolset.Data.Tuples
 
         public string WixChainItem_
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItem_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.WixChainItem_];
             set => this.Set((int)WixBundlePackageTupleFields.WixChainItem_, value);
         }
 
         public WixBundlePackageType Type
         {
-            get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageTupleFields.Type]?.Value, true);
+            get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageTupleFields.Type], true);
             set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
         }
 
         public string Payload_
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Payload_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Payload_];
             set => this.Set((int)WixBundlePackageTupleFields.Payload_, value);
         }
 
         public WixBundlePackageAttributes Attributes
         {
-            get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageTupleFields.Attributes]?.Value;
+            get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageTupleFields.Attributes];
             set => this.Set((int)WixBundlePackageTupleFields.Attributes, (int)value);
         }
 
         public string InstallCondition
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.InstallCondition]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.InstallCondition];
             set => this.Set((int)WixBundlePackageTupleFields.InstallCondition, value);
         }
 
         public YesNoAlwaysType Cache
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.Cache]?.Value, true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
             set => this.Set((int)WixBundlePackageTupleFields.Cache, value.ToString().ToLowerInvariant());
         }
 
         public string CacheId
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.CacheId]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.CacheId];
             set => this.Set((int)WixBundlePackageTupleFields.CacheId, value);
         }
 
         public bool? Vital
         {
-            get => (bool?)this.Fields[(int)WixBundlePackageTupleFields.Vital]?.Value;
+            get => (bool?)this.Fields[(int)WixBundlePackageTupleFields.Vital];
             set => this.Set((int)WixBundlePackageTupleFields.Vital, value);
         }
 
         public YesNoDefaultType PerMachine
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.PerMachine]?.Value, true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.PerMachine], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
             set => this.Set((int)WixBundlePackageTupleFields.PerMachine, value.ToString().ToLowerInvariant());
         }
 
         public string LogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.LogPathVariable]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.LogPathVariable];
             set => this.Set((int)WixBundlePackageTupleFields.LogPathVariable, value);
         }
 
         public string RollbackLogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackLogPathVariable]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackLogPathVariable];
             set => this.Set((int)WixBundlePackageTupleFields.RollbackLogPathVariable, value);
         }
 
         public int Size
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Size]?.Value;
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Size];
             set => this.Set((int)WixBundlePackageTupleFields.Size, value);
         }
 
         public int InstallSize
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.InstallSize]?.Value;
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.InstallSize];
             set => this.Set((int)WixBundlePackageTupleFields.InstallSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Version];
             set => this.Set((int)WixBundlePackageTupleFields.Version, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Language]?.Value;
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Language];
             set => this.Set((int)WixBundlePackageTupleFields.Language, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.DisplayName];
             set => this.Set((int)WixBundlePackageTupleFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Description];
             set => this.Set((int)WixBundlePackageTupleFields.Description, value);
         }
 
         public string RollbackBoundary_
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundary_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundary_];
             set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundary_, value);
         }
 
         public string RollbackBoundaryBackward_
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackward_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackward_];
             set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackward_, value);
         }
 
         public int x64
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.x64]?.Value;
+            get => (int)this.Fields[(int)WixBundlePackageTupleFields.x64];
             set => this.Set((int)WixBundlePackageTupleFields.x64, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
index d34c0d2a..f8752067 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string PackageId
         {
-            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.PackageId]?.Value;
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.PackageId];
             set => this.Set((int)WixBundlePatchTargetCodeTupleFields.PackageId, value);
         }
 
         public string TargetCode
         {
-            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.TargetCode]?.Value;
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.TargetCode];
             set => this.Set((int)WixBundlePatchTargetCodeTupleFields.TargetCode, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.Attributes];
             set => this.Set((int)WixBundlePatchTargetCodeTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
index c1f0df6a..c2f01ebc 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePayloadGroup
         {
-            get => (string)this.Fields[(int)WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup];
             set => this.Set((int)WixBundlePayloadGroupTupleFields.WixBundlePayloadGroup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
index d2a82f93..ce5ff8be 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
@@ -81,133 +81,133 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePayload
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.WixBundlePayload]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.WixBundlePayload];
             set => this.Set((int)WixBundlePayloadTupleFields.WixBundlePayload, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Name];
             set => this.Set((int)WixBundlePayloadTupleFields.Name, value);
         }
 
         public string SourceFile
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.SourceFile]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.SourceFile];
             set => this.Set((int)WixBundlePayloadTupleFields.SourceFile, value);
         }
 
         public string DownloadUrl
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DownloadUrl]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DownloadUrl];
             set => this.Set((int)WixBundlePayloadTupleFields.DownloadUrl, value);
         }
 
         public YesNoDefaultType Compressed
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePayloadTupleFields.Compressed]?.Value, true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePayloadTupleFields.Compressed], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
             set => this.Set((int)WixBundlePayloadTupleFields.Compressed, value.ToString().ToLowerInvariant());
         }
 
         public string UnresolvedSourceFile
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.UnresolvedSourceFile]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.UnresolvedSourceFile];
             set => this.Set((int)WixBundlePayloadTupleFields.UnresolvedSourceFile, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DisplayName];
             set => this.Set((int)WixBundlePayloadTupleFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Description];
             set => this.Set((int)WixBundlePayloadTupleFields.Description, value);
         }
 
         public bool EnableSignatureValidation
         {
-            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.EnableSignatureValidation]?.Value;
+            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.EnableSignatureValidation];
             set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value);
         }
 
         public int FileSize
         {
-            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.FileSize]?.Value;
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.FileSize];
             set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Version];
             set => this.Set((int)WixBundlePayloadTupleFields.Version, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Hash]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Hash];
             set => this.Set((int)WixBundlePayloadTupleFields.Hash, value);
         }
 
         public string PublicKey
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PublicKey]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PublicKey];
             set => this.Set((int)WixBundlePayloadTupleFields.PublicKey, value);
         }
 
         public string Thumbprint
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Thumbprint]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Thumbprint];
             set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
         }
 
         public string Catalog_
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Catalog_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Catalog_];
             set => this.Set((int)WixBundlePayloadTupleFields.Catalog_, value);
         }
 
         public string Container_
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Container_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Container_];
             set => this.Set((int)WixBundlePayloadTupleFields.Container_, value);
         }
 
         public string Package
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Package]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Package];
             set => this.Set((int)WixBundlePayloadTupleFields.Package, value);
         }
 
         public bool ContentFile
         {
-            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.ContentFile]?.Value;
+            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.ContentFile];
             set => this.Set((int)WixBundlePayloadTupleFields.ContentFile, value);
         }
 
         public string EmbeddedId
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.EmbeddedId]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.EmbeddedId];
             set => this.Set((int)WixBundlePayloadTupleFields.EmbeddedId, value);
         }
 
         public int LayoutOnly
         {
-            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.LayoutOnly]?.Value;
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.LayoutOnly];
             set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value);
         }
 
         public int Packaging
         {
-            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.Packaging]?.Value;
+            get => (int)this.Fields[(int)WixBundlePayloadTupleFields.Packaging];
             set => this.Set((int)WixBundlePayloadTupleFields.Packaging, value);
         }
 
         public string ParentPackagePayload_
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayload_]?.Value;
+            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayload_];
             set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayload_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
index 8a42c3c6..fef0c997 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePropertiesTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.DisplayName];
             set => this.Set((int)WixBundlePropertiesTupleFields.DisplayName, value);
         }
 
         public string LogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.LogPathVariable]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.LogPathVariable];
             set => this.Set((int)WixBundlePropertiesTupleFields.LogPathVariable, value);
         }
 
         public string Compressed
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Compressed]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Compressed];
             set => this.Set((int)WixBundlePropertiesTupleFields.Compressed, value);
         }
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.Id];
             set => this.Set((int)WixBundlePropertiesTupleFields.Id, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.UpgradeCode];
             set => this.Set((int)WixBundlePropertiesTupleFields.UpgradeCode, value);
         }
 
         public string PerMachine
         {
-            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.PerMachine]?.Value;
+            get => (string)this.Fields[(int)WixBundlePropertiesTupleFields.PerMachine];
             set => this.Set((int)WixBundlePropertiesTupleFields.PerMachine, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
index d3e1069a..7b1bed66 100644
--- a/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
@@ -53,55 +53,55 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.WixBundlePackage_, value);
         }
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Id];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.Id, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinVersion]?.Value;
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinVersion];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxVersion]?.Value;
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxVersion];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxVersion, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Languages]?.Value;
+            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Languages];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.Languages, value);
         }
 
         public int MinInclusive
         {
-            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinInclusive]?.Value;
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinInclusive];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.MinInclusive, value);
         }
 
         public int MaxInclusive
         {
-            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxInclusive]?.Value;
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxInclusive];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxInclusive, value);
         }
 
         public int LangInclusive
         {
-            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.LangInclusive]?.Value;
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.LangInclusive];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.LangInclusive, value);
         }
 
         public int OnlyDetect
         {
-            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.OnlyDetect]?.Value;
+            get => (int)this.Fields[(int)WixBundleRelatedPackageTupleFields.OnlyDetect];
             set => this.Set((int)WixBundleRelatedPackageTupleFields.OnlyDetect, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
index d08f0eb9..b3ed7559 100644
--- a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixChainItem_
         {
-            get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItem_]?.Value;
+            get => (string)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.WixChainItem_];
             set => this.Set((int)WixBundleRollbackBoundaryTupleFields.WixChainItem_, value);
         }
 
         public bool? Vital
         {
-            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Vital]?.Value;
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Vital];
             set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Vital, value);
         }
 
         public bool? Transaction
         {
-            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Transaction]?.Value;
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Transaction];
             set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Transaction, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
index c0ab124d..38893a63 100644
--- a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundlePackage_
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_]?.Value;
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_];
             set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_, value);
         }
 
         public string WixBundlePackage_Msp
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp]?.Value;
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp];
             set => this.Set((int)WixBundleSlipstreamMspTupleFields.WixBundlePackage_Msp, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleTuple.cs b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
index 4647347b..f7cd4f23 100644
--- a/src/WixToolset.Data/Tuples/WixBundleTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
@@ -81,139 +81,139 @@ namespace WixToolset.Data.Tuples
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Version];
             set => this.Set((int)WixBundleTupleFields.Version, value);
         }
 
         public string Copyright
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Copyright]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Copyright];
             set => this.Set((int)WixBundleTupleFields.Copyright, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Name];
             set => this.Set((int)WixBundleTupleFields.Name, value);
         }
 
         public string AboutUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.AboutUrl]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.AboutUrl];
             set => this.Set((int)WixBundleTupleFields.AboutUrl, value);
         }
 
         public int DisableModify
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.DisableModify]?.Value;
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableModify];
             set => this.Set((int)WixBundleTupleFields.DisableModify, value);
         }
 
         public int DisableRemove
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRemove]?.Value;
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRemove];
             set => this.Set((int)WixBundleTupleFields.DisableRemove, value);
         }
 
         public int DisableRepair
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRepair]?.Value;
+            get => (int)this.Fields[(int)WixBundleTupleFields.DisableRepair];
             set => this.Set((int)WixBundleTupleFields.DisableRepair, value);
         }
 
         public string HelpTelephone
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.HelpTelephone]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.HelpTelephone];
             set => this.Set((int)WixBundleTupleFields.HelpTelephone, value);
         }
 
         public string HelpUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.HelpUrl]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.HelpUrl];
             set => this.Set((int)WixBundleTupleFields.HelpUrl, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Manufacturer]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Manufacturer];
             set => this.Set((int)WixBundleTupleFields.Manufacturer, value);
         }
 
         public string UpdateUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.UpdateUrl]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.UpdateUrl];
             set => this.Set((int)WixBundleTupleFields.UpdateUrl, value);
         }
 
         public int Compressed
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.Compressed]?.Value;
+            get => (int)this.Fields[(int)WixBundleTupleFields.Compressed];
             set => this.Set((int)WixBundleTupleFields.Compressed, value);
         }
 
         public string LogPrefixAndExtension
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.LogPrefixAndExtension]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.LogPrefixAndExtension];
             set => this.Set((int)WixBundleTupleFields.LogPrefixAndExtension, value);
         }
 
         public string IconSourceFile
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.IconSourceFile]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.IconSourceFile];
             set => this.Set((int)WixBundleTupleFields.IconSourceFile, value);
         }
 
         public string SplashScreenSourceFile
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.SplashScreenSourceFile]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.SplashScreenSourceFile];
             set => this.Set((int)WixBundleTupleFields.SplashScreenSourceFile, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Condition];
             set => this.Set((int)WixBundleTupleFields.Condition, value);
         }
 
         public string Tag
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Tag]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Tag];
             set => this.Set((int)WixBundleTupleFields.Tag, value);
         }
 
         public string Platform
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Platform]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.Platform];
             set => this.Set((int)WixBundleTupleFields.Platform, value);
         }
 
         public string ParentName
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.ParentName]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.ParentName];
             set => this.Set((int)WixBundleTupleFields.ParentName, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.UpgradeCode];
             set => this.Set((int)WixBundleTupleFields.UpgradeCode, value);
         }
 
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.BundleId]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.BundleId];
             set => this.Set((int)WixBundleTupleFields.BundleId, value);
         }
 
         public string ProviderKey
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.ProviderKey]?.Value;
+            get => (string)this.Fields[(int)WixBundleTupleFields.ProviderKey];
             set => this.Set((int)WixBundleTupleFields.ProviderKey, value);
         }
 
         public int PerMachine
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.PerMachine]?.Value;
+            get => (int)this.Fields[(int)WixBundleTupleFields.PerMachine];
             set => this.Set((int)WixBundleTupleFields.PerMachine, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
index 2398b1da..25686027 100644
--- a/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Location
         {
-            get => (string)this.Fields[(int)WixBundleUpdateTupleFields.Location]?.Value;
+            get => (string)this.Fields[(int)WixBundleUpdateTupleFields.Location];
             set => this.Set((int)WixBundleUpdateTupleFields.Location, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixBundleUpdateTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixBundleUpdateTupleFields.Attributes];
             set => this.Set((int)WixBundleUpdateTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
index c5724e6c..b71f20e1 100644
--- a/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string WixBundleVariable
         {
-            get => (string)this.Fields[(int)WixBundleVariableTupleFields.WixBundleVariable]?.Value;
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.WixBundleVariable];
             set => this.Set((int)WixBundleVariableTupleFields.WixBundleVariable, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value];
             set => this.Set((int)WixBundleVariableTupleFields.Value, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Type]?.Value;
+            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Type];
             set => this.Set((int)WixBundleVariableTupleFields.Type, value);
         }
 
         public bool Hidden
         {
-            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Hidden]?.Value;
+            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Hidden];
             set => this.Set((int)WixBundleVariableTupleFields.Hidden, value);
         }
 
         public bool Persisted
         {
-            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Persisted]?.Value;
+            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Persisted];
             set => this.Set((int)WixBundleVariableTupleFields.Persisted, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixChainItemTuple.cs b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
index c77bd038..12383f53 100644
--- a/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixChainItemTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixChainItemTupleFields.Id];
             set => this.Set((int)WixChainItemTupleFields.Id, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixChainTuple.cs b/src/WixToolset.Data/Tuples/WixChainTuple.cs
index d3ae2f4a..d8bef8cc 100644
--- a/src/WixToolset.Data/Tuples/WixChainTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixChainTuple.cs
@@ -48,7 +48,7 @@ namespace WixToolset.Data.Tuples
 
         public WixChainAttributes Attributes
         {
-            get => (WixChainAttributes)(int)this.Fields[(int)WixChainTupleFields.Attributes]?.Value;
+            get => (WixChainAttributes)(int)this.Fields[(int)WixChainTupleFields.Attributes];
             set => this.Set((int)WixChainTupleFields.Attributes, (int)value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
index 46de9aa9..3d573f7a 100644
--- a/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
@@ -49,37 +49,37 @@ namespace WixToolset.Data.Tuples
 
         public string Parent
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Parent]?.Value;
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Parent];
             set => this.Set((int)WixComplexReferenceTupleFields.Parent, value);
         }
 
         public ComplexReferenceParentType ParentType
         {
-            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentAttributes]?.Value, true);
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentAttributes], true);
             set => this.Set((int)WixComplexReferenceTupleFields.ParentAttributes, value.ToString());
         }
 
         public string ParentLanguage
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentLanguage]?.Value;
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentLanguage];
             set => this.Set((int)WixComplexReferenceTupleFields.ParentLanguage, value);
         }
 
         public string Child
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Child]?.Value;
+            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Child];
             set => this.Set((int)WixComplexReferenceTupleFields.Child, value);
         }
 
         public ComplexReferenceChildType ChildType
         {
-            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ChildAttributes]?.Value, true);
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ChildAttributes], true);
             set => this.Set((int)WixComplexReferenceTupleFields.ChildAttributes, value.ToString());
         }
 
         public bool IsPrimary
         {
-            get => (bool)this.Fields[(int)WixComplexReferenceTupleFields.Attributes]?.Value;
+            get => (bool)this.Fields[(int)WixComplexReferenceTupleFields.Attributes];
             set => this.Set((int)WixComplexReferenceTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
index f4118277..1209790f 100644
--- a/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixComponentGroup
         {
-            get => (string)this.Fields[(int)WixComponentGroupTupleFields.WixComponentGroup]?.Value;
+            get => (string)this.Fields[(int)WixComponentGroupTupleFields.WixComponentGroup];
             set => this.Set((int)WixComponentGroupTupleFields.WixComponentGroup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
index 7aad13d2..fc3c23e3 100644
--- a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_];
             set => this.Set((int)WixComponentSearchTupleFields.WixSearch_, value);
         }
 
         public string Guid
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid];
             set => this.Set((int)WixComponentSearchTupleFields.Guid, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode];
             set => this.Set((int)WixComponentSearchTupleFields.ProductCode, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixComponentSearchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixComponentSearchTupleFields.Attributes];
             set => this.Set((int)WixComponentSearchTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
index c7ab0b0b..ec73c1b8 100644
--- a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixCustomRowTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)WixCustomRowTupleFields.Table];
             set => this.Set((int)WixCustomRowTupleFields.Table, value);
         }
 
         public string FieldData
         {
-            get => (string)this.Fields[(int)WixCustomRowTupleFields.FieldData]?.Value;
+            get => (string)this.Fields[(int)WixCustomRowTupleFields.FieldData];
             set => this.Set((int)WixCustomRowTupleFields.FieldData, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
index 58266aff..fd21fe2d 100644
--- a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
@@ -63,85 +63,85 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Table];
             set => this.Set((int)WixCustomTableTupleFields.Table, value);
         }
 
         public int ColumnCount
         {
-            get => (int)this.Fields[(int)WixCustomTableTupleFields.ColumnCount]?.Value;
+            get => (int)this.Fields[(int)WixCustomTableTupleFields.ColumnCount];
             set => this.Set((int)WixCustomTableTupleFields.ColumnCount, value);
         }
 
         public string ColumnNames
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnNames]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnNames];
             set => this.Set((int)WixCustomTableTupleFields.ColumnNames, value);
         }
 
         public string ColumnTypes
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnTypes]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnTypes];
             set => this.Set((int)WixCustomTableTupleFields.ColumnTypes, value);
         }
 
         public string PrimaryKeys
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.PrimaryKeys]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.PrimaryKeys];
             set => this.Set((int)WixCustomTableTupleFields.PrimaryKeys, value);
         }
 
         public string MinValues
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.MinValues]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.MinValues];
             set => this.Set((int)WixCustomTableTupleFields.MinValues, value);
         }
 
         public string MaxValues
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.MaxValues]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.MaxValues];
             set => this.Set((int)WixCustomTableTupleFields.MaxValues, value);
         }
 
         public string KeyTables
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyTables]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyTables];
             set => this.Set((int)WixCustomTableTupleFields.KeyTables, value);
         }
 
         public string KeyColumns
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyColumns]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.KeyColumns];
             set => this.Set((int)WixCustomTableTupleFields.KeyColumns, value);
         }
 
         public string Categories
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.Categories]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Categories];
             set => this.Set((int)WixCustomTableTupleFields.Categories, value);
         }
 
         public string Sets
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.Sets]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Sets];
             set => this.Set((int)WixCustomTableTupleFields.Sets, value);
         }
 
         public string Descriptions
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.Descriptions]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Descriptions];
             set => this.Set((int)WixCustomTableTupleFields.Descriptions, value);
         }
 
         public string Modularizations
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.Modularizations]?.Value;
+            get => (string)this.Fields[(int)WixCustomTableTupleFields.Modularizations];
             set => this.Set((int)WixCustomTableTupleFields.Modularizations, value);
         }
 
         public int BootstrapperApplicationData
         {
-            get => (int)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData]?.Value;
+            get => (int)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData];
             set => this.Set((int)WixCustomTableTupleFields.BootstrapperApplicationData, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
index 68f327f4..a8e191df 100644
--- a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
@@ -47,37 +47,37 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.File_];
             set => this.Set((int)WixDeltaPatchFileTupleFields.File_, value);
         }
 
         public string RetainLengths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths];
             set => this.Set((int)WixDeltaPatchFileTupleFields.RetainLengths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets];
             set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths];
             set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets];
             set => this.Set((int)WixDeltaPatchFileTupleFields.RetainOffsets, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths];
             set => this.Set((int)WixDeltaPatchFileTupleFields.SymbolPaths, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
index 39747be5..9537db3a 100644
--- a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
@@ -56,19 +56,19 @@ namespace WixToolset.Data.Tuples
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Id];
             set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Id, value);
         }
 
         public SymbolPathType Type
         {
-            get => (SymbolPathType)Enum.Parse(typeof(SymbolPathType), (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Type]?.Value, true);
+            get => (SymbolPathType)Enum.Parse(typeof(SymbolPathType), (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.Type], true);
             set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.Type, value.ToString());
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths]?.Value;
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths];
             set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
index cc80a5d9..cd47c0fd 100644
--- a/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixEnsureTableTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)WixEnsureTableTupleFields.Table];
             set => this.Set((int)WixEnsureTableTupleFields.Table, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
index 20e88ce8..e2ae6b14 100644
--- a/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixFeatureGroup
         {
-            get => (string)this.Fields[(int)WixFeatureGroupTupleFields.WixFeatureGroup]?.Value;
+            get => (string)this.Fields[(int)WixFeatureGroupTupleFields.WixFeatureGroup];
             set => this.Set((int)WixFeatureGroupTupleFields.WixFeatureGroup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
index 23524b1d..963c07d8 100644
--- a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.Feature_];
             set => this.Set((int)WixFeatureModulesTupleFields.Feature_, value);
         }
 
         public string WixMerge_
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMerge_]?.Value;
+            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMerge_];
             set => this.Set((int)WixFeatureModulesTupleFields.WixMerge_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
index 62d19ec8..a5da5f2b 100644
--- a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
@@ -55,61 +55,61 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.WixSearch_];
             set => this.Set((int)WixFileSearchTupleFields.WixSearch_, value);
         }
 
         public string Path
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.Path]?.Value;
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.Path];
             set => this.Set((int)WixFileSearchTupleFields.Path, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.MinVersion]?.Value;
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.MinVersion];
             set => this.Set((int)WixFileSearchTupleFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.MaxVersion]?.Value;
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.MaxVersion];
             set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value);
         }
 
         public int MinSize
         {
-            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinSize]?.Value;
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinSize];
             set => this.Set((int)WixFileSearchTupleFields.MinSize, value);
         }
 
         public int MaxSize
         {
-            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxSize]?.Value;
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxSize];
             set => this.Set((int)WixFileSearchTupleFields.MaxSize, value);
         }
 
         public int MinDate
         {
-            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinDate]?.Value;
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MinDate];
             set => this.Set((int)WixFileSearchTupleFields.MinDate, value);
         }
 
         public int MaxDate
         {
-            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxDate]?.Value;
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.MaxDate];
             set => this.Set((int)WixFileSearchTupleFields.MaxDate, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.Languages]?.Value;
+            get => (string)this.Fields[(int)WixFileSearchTupleFields.Languages];
             set => this.Set((int)WixFileSearchTupleFields.Languages, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixFileSearchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixFileSearchTupleFields.Attributes];
             set => this.Set((int)WixFileSearchTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixFileTuple.cs b/src/WixToolset.Data/Tuples/WixFileTuple.cs
index 3581e2e6..077622b7 100644
--- a/src/WixToolset.Data/Tuples/WixFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileTuple.cs
@@ -97,37 +97,37 @@ namespace WixToolset.Data.Tuples
 
         public string File_
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.File_]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.File_];
             set => this.Set((int)WixFileTupleFields.File_, value);
         }
 
         public FileAssemblyType AssemblyType
         {
-            get => (FileAssemblyType)(int)this.Fields[(int)WixFileTupleFields.AssemblyType]?.Value;
+            get => (FileAssemblyType)(int)this.Fields[(int)WixFileTupleFields.AssemblyType];
             set => this.Set((int)WixFileTupleFields.AssemblyType, (int)value);
         }
 
         public string File_AssemblyManifest
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyManifest]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyManifest];
             set => this.Set((int)WixFileTupleFields.File_AssemblyManifest, value);
         }
 
         public string File_AssemblyApplication
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyApplication]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.File_AssemblyApplication];
             set => this.Set((int)WixFileTupleFields.File_AssemblyApplication, value);
         }
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.Directory_];
             set => this.Set((int)WixFileTupleFields.Directory_, value);
         }
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)WixFileTupleFields.DiskId]?.Value;
+            get => (int)this.Fields[(int)WixFileTupleFields.DiskId];
             set => this.Set((int)WixFileTupleFields.DiskId, value);
         }
 
@@ -139,31 +139,31 @@ namespace WixToolset.Data.Tuples
 
         public string ProcessorArchitecture
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.ProcessorArchitecture]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.ProcessorArchitecture];
             set => this.Set((int)WixFileTupleFields.ProcessorArchitecture, value);
         }
 
         public int PatchGroup
         {
-            get => (int)this.Fields[(int)WixFileTupleFields.PatchGroup]?.Value;
+            get => (int)this.Fields[(int)WixFileTupleFields.PatchGroup];
             set => this.Set((int)WixFileTupleFields.PatchGroup, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixFileTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixFileTupleFields.Attributes];
             set => this.Set((int)WixFileTupleFields.Attributes, value);
         }
 
         public PatchAttributeType PatchAttributes
         {
-            get => (PatchAttributeType)(int)this.Fields[(int)WixFileTupleFields.PatchAttributes]?.Value;
+            get => (PatchAttributeType)(int)this.Fields[(int)WixFileTupleFields.PatchAttributes];
             set => this.Set((int)WixFileTupleFields.PatchAttributes, (int)value);
         }
 
         public string DeltaPatchHeaderSource
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.DeltaPatchHeaderSource]?.Value;
+            get => (string)this.Fields[(int)WixFileTupleFields.DeltaPatchHeaderSource];
             set => this.Set((int)WixFileTupleFields.DeltaPatchHeaderSource, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
index a5a59962..fd4c309d 100644
--- a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixFragment
         {
-            get => (string)this.Fields[(int)WixFragmentTupleFields.WixFragment]?.Value;
+            get => (string)this.Fields[(int)WixFragmentTupleFields.WixFragment];
             set => this.Set((int)WixFragmentTupleFields.WixFragment, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixGroupTuple.cs b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
index be6bf7a4..f6487d55 100644
--- a/src/WixToolset.Data/Tuples/WixGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
@@ -45,25 +45,25 @@ namespace WixToolset.Data.Tuples
 
         public string ParentId
         {
-            get => (string)this.Fields[(int)WixGroupTupleFields.ParentId]?.Value;
+            get => (string)this.Fields[(int)WixGroupTupleFields.ParentId];
             set => this.Set((int)WixGroupTupleFields.ParentId, value);
         }
 
         public ComplexReferenceParentType ParentType
         {
-            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupTupleFields.ParentType]?.Value, true);
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupTupleFields.ParentType], true);
             set => this.Set((int)WixGroupTupleFields.ParentType, value.ToString());
         }
 
         public string ChildId
         {
-            get => (string)this.Fields[(int)WixGroupTupleFields.ChildId]?.Value;
+            get => (string)this.Fields[(int)WixGroupTupleFields.ChildId];
             set => this.Set((int)WixGroupTupleFields.ChildId, value);
         }
 
         public ComplexReferenceChildType ChildType
         {
-            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupTupleFields.ChildType]?.Value, true);
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupTupleFields.ChildType], true);
             set => this.Set((int)WixGroupTupleFields.ChildType, value.ToString());
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
index b2fd18ca..3c9f69a0 100644
--- a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string Component_
         {
-            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.Component_]?.Value;
+            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.Component_];
             set => this.Set((int)WixInstanceComponentTupleFields.Component_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
index 4f152ac6..a72bad0f 100644
--- a/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Id
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.Id]?.Value;
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.Id];
             set => this.Set((int)WixInstanceTransformsTupleFields.Id, value);
         }
 
         public string PropertyId
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId]?.Value;
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId];
             set => this.Set((int)WixInstanceTransformsTupleFields.PropertyId, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductCode];
             set => this.Set((int)WixInstanceTransformsTupleFields.ProductCode, value);
         }
 
         public string ProductName
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductName]?.Value;
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductName];
             set => this.Set((int)WixInstanceTransformsTupleFields.ProductName, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.UpgradeCode];
             set => this.Set((int)WixInstanceTransformsTupleFields.UpgradeCode, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
index f7ac8bc4..4e71be2d 100644
--- a/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
@@ -49,7 +49,7 @@ namespace WixToolset.Data.Tuples
 
         public string CabinetTemplate
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.CabinetTemplate]?.Value;
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.CabinetTemplate];
             set => this.Set((int)WixMediaTemplateTupleFields.CabinetTemplate, value);
         }
 
@@ -57,7 +57,7 @@ namespace WixToolset.Data.Tuples
         {
             get
             {
-                var value = (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value;
+                var value = (string)this.Fields[(int)WixMediaTupleFields.CompressionLevel];
                 return String.IsNullOrEmpty(value) ? null : (CompressionLevel?)Enum.Parse(typeof(CompressionLevel), value, true);
             }
 
@@ -66,25 +66,25 @@ namespace WixToolset.Data.Tuples
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.DiskPrompt]?.Value;
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.DiskPrompt];
             set => this.Set((int)WixMediaTemplateTupleFields.DiskPrompt, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.VolumeLabel]?.Value;
+            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.VolumeLabel];
             set => this.Set((int)WixMediaTemplateTupleFields.VolumeLabel, value);
         }
 
         public int MaximumUncompressedMediaSize
         {
-            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize]?.Value;
+            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize];
             set => this.Set((int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize, value);
         }
 
         public int MaximumCabinetSizeForLargeFileSplitting
         {
-            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting]?.Value;
+            get => (int)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting];
             set => this.Set((int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixMediaTuple.cs b/src/WixToolset.Data/Tuples/WixMediaTuple.cs
index ec887df6..a705a4a2 100644
--- a/src/WixToolset.Data/Tuples/WixMediaTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMediaTuple.cs
@@ -43,19 +43,19 @@ namespace WixToolset.Data.Tuples
 
         public int DiskId_
         {
-            get => (int)this.Fields[(int)WixMediaTupleFields.DiskId_]?.Value;
+            get => (int)this.Fields[(int)WixMediaTupleFields.DiskId_];
             set => this.Set((int)WixMediaTupleFields.DiskId_, value);
         }
 
         public CompressionLevel? CompressionLevel
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixMediaTupleFields.CompressionLevel]?.Value, true, out CompressionLevel value) ? value : (CompressionLevel?)null;
+            get => Enum.TryParse((string)this.Fields[(int)WixMediaTupleFields.CompressionLevel], true, out CompressionLevel value) ? value : (CompressionLevel?)null;
             set => this.Set((int)WixMediaTupleFields.CompressionLevel, value?.ToString());
         }
 
         public string Layout
         {
-            get => (string)this.Fields[(int)WixMediaTupleFields.Layout]?.Value;
+            get => (string)this.Fields[(int)WixMediaTupleFields.Layout];
             set => this.Set((int)WixMediaTupleFields.Layout, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
index 8f44e6a4..6c5120b5 100644
--- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
@@ -51,49 +51,49 @@ namespace WixToolset.Data.Tuples
 
         public string WixMerge
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.WixMerge]?.Value;
+            get => (string)this.Fields[(int)WixMergeTupleFields.WixMerge];
             set => this.Set((int)WixMergeTupleFields.WixMerge, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)WixMergeTupleFields.Language]?.Value;
+            get => (int)this.Fields[(int)WixMergeTupleFields.Language];
             set => this.Set((int)WixMergeTupleFields.Language, value);
         }
 
         public string Directory_
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.Directory_]?.Value;
+            get => (string)this.Fields[(int)WixMergeTupleFields.Directory_];
             set => this.Set((int)WixMergeTupleFields.Directory_, value);
         }
 
         public string SourceFile
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.SourceFile]?.Value;
+            get => (string)this.Fields[(int)WixMergeTupleFields.SourceFile];
             set => this.Set((int)WixMergeTupleFields.SourceFile, value);
         }
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)WixMergeTupleFields.DiskId]?.Value;
+            get => (int)this.Fields[(int)WixMergeTupleFields.DiskId];
             set => this.Set((int)WixMergeTupleFields.DiskId, value);
         }
 
         public bool? FileCompression
         {
-            get => (bool?)this.Fields[(int)WixMergeTupleFields.FileCompression]?.Value;
+            get => (bool?)this.Fields[(int)WixMergeTupleFields.FileCompression];
             set => this.Set((int)WixMergeTupleFields.FileCompression, value);
         }
 
         public string ConfigurationData
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.ConfigurationData]?.Value;
+            get => (string)this.Fields[(int)WixMergeTupleFields.ConfigurationData];
             set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
         }
 
         public string Feature_
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.Feature_]?.Value;
+            get => (string)this.Fields[(int)WixMergeTupleFields.Feature_];
             set => this.Set((int)WixMergeTupleFields.Feature_, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs b/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs
index 03948efb..bcc0ad78 100644
--- a/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPackageFeatureInfoTuple.cs
@@ -55,61 +55,61 @@ namespace WixToolset.Data.Tuples
 
         public string Package
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Package]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Package];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Package, value);
         }
 
         public string Feature
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Feature]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Feature];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Feature, value);
         }
 
         public string Size
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Size]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Size];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Size, value);
         }
 
         public string Parent
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Parent]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Parent];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Parent, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Title]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Title];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Title, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Description];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Description, value);
         }
 
         public string Display
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Display]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Display];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Display, value);
         }
 
         public string Level
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Level]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Level];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Level, value);
         }
 
         public string Directory
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Directory]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Directory];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Directory, value);
         }
 
         public string Attributes
         {
-            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Attributes]?.Value;
+            get => (string)this.Fields[(int)WixPackageFeatureInfoTupleFields.Attributes];
             set => this.Set((int)WixPackageFeatureInfoTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs
index 4823409d..56f6523b 100644
--- a/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPackagePropertiesTuple.cs
@@ -71,109 +71,109 @@ namespace WixToolset.Data.Tuples
 
         public string Package
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Package]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Package];
             set => this.Set((int)WixPackagePropertiesTupleFields.Package, value);
         }
 
         public string Vital
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Vital]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Vital];
             set => this.Set((int)WixPackagePropertiesTupleFields.Vital, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayName]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayName];
             set => this.Set((int)WixPackagePropertiesTupleFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Description];
             set => this.Set((int)WixPackagePropertiesTupleFields.Description, value);
         }
 
         public string DownloadSize
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DownloadSize]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DownloadSize];
             set => this.Set((int)WixPackagePropertiesTupleFields.DownloadSize, value);
         }
 
         public string PackageSize
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageSize]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageSize];
             set => this.Set((int)WixPackagePropertiesTupleFields.PackageSize, value);
         }
 
         public string InstalledSize
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstalledSize]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstalledSize];
             set => this.Set((int)WixPackagePropertiesTupleFields.InstalledSize, value);
         }
 
         public string PackageType
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageType]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.PackageType];
             set => this.Set((int)WixPackagePropertiesTupleFields.PackageType, value);
         }
 
         public string Permanent
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Permanent]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Permanent];
             set => this.Set((int)WixPackagePropertiesTupleFields.Permanent, value);
         }
 
         public string LogPathVariable
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.LogPathVariable]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.LogPathVariable];
             set => this.Set((int)WixPackagePropertiesTupleFields.LogPathVariable, value);
         }
 
         public string RollbackLogPathVariable
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.RollbackLogPathVariable]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.RollbackLogPathVariable];
             set => this.Set((int)WixPackagePropertiesTupleFields.RollbackLogPathVariable, value);
         }
 
         public string Compressed
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Compressed]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Compressed];
             set => this.Set((int)WixPackagePropertiesTupleFields.Compressed, value);
         }
 
         public string DisplayInternalUI
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayInternalUI]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.DisplayInternalUI];
             set => this.Set((int)WixPackagePropertiesTupleFields.DisplayInternalUI, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.ProductCode];
             set => this.Set((int)WixPackagePropertiesTupleFields.ProductCode, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.UpgradeCode]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.UpgradeCode];
             set => this.Set((int)WixPackagePropertiesTupleFields.UpgradeCode, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Version]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Version];
             set => this.Set((int)WixPackagePropertiesTupleFields.Version, value);
         }
 
         public string InstallCondition
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstallCondition]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.InstallCondition];
             set => this.Set((int)WixPackagePropertiesTupleFields.InstallCondition, value);
         }
 
         public string Cache
         {
-            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Cache]?.Value;
+            get => (string)this.Fields[(int)WixPackagePropertiesTupleFields.Cache];
             set => this.Set((int)WixPackagePropertiesTupleFields.Cache, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
index 0610adac..6a456d4b 100644
--- a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixPatchBaseline
         {
-            get => (string)this.Fields[(int)WixPatchBaselineTupleFields.WixPatchBaseline]?.Value;
+            get => (string)this.Fields[(int)WixPatchBaselineTupleFields.WixPatchBaseline];
             set => this.Set((int)WixPatchBaselineTupleFields.WixPatchBaseline, value);
         }
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId]?.Value;
+            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId];
             set => this.Set((int)WixPatchBaselineTupleFields.DiskId, value);
         }
 
         public int ValidationFlags
         {
-            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags]?.Value;
+            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags];
             set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
index 0683ba9d..d6df55bd 100644
--- a/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixPatchFamilyGroup
         {
-            get => (string)this.Fields[(int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup]?.Value;
+            get => (string)this.Fields[(int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup];
             set => this.Set((int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
index f589a9fc..303ccecd 100644
--- a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixPatchIdTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixPatchIdTupleFields.ProductCode];
             set => this.Set((int)WixPatchIdTupleFields.ProductCode, value);
         }
 
         public string ClientPatchId
         {
-            get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId]?.Value;
+            get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId];
             set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
         }
 
         public bool OptimizePatchSizeForLargeFiles
         {
-            get => (bool)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]?.Value;
+            get => (bool)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles];
             set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
         }
 
         public int ApiPatchingSymbolFlags
         {
-            get => (int)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags]?.Value;
+            get => (int)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags];
             set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs
index c00031a5..7c065fe8 100644
--- a/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Property
         {
-            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Property]?.Value;
+            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Property];
             set => this.Set((int)WixPatchMetadataTupleFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Value];
             set => this.Set((int)WixPatchMetadataTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
index 63528439..fa357566 100644
--- a/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixPatchRefTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)WixPatchRefTupleFields.Table];
             set => this.Set((int)WixPatchRefTupleFields.Table, value);
         }
 
         public string PrimaryKeys
         {
-            get => (string)this.Fields[(int)WixPatchRefTupleFields.PrimaryKeys]?.Value;
+            get => (string)this.Fields[(int)WixPatchRefTupleFields.PrimaryKeys];
             set => this.Set((int)WixPatchRefTupleFields.PrimaryKeys, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
index 8940c0c6..c0d7a095 100644
--- a/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixPatchTargetTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixPatchTargetTupleFields.ProductCode];
             set => this.Set((int)WixPatchTargetTupleFields.ProductCode, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs b/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs
index 3c437a58..c992bb4f 100644
--- a/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPayloadPropertiesTuple.cs
@@ -49,43 +49,43 @@ namespace WixToolset.Data.Tuples
 
         public string Payload
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Payload]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Payload];
             set => this.Set((int)WixPayloadPropertiesTupleFields.Payload, value);
         }
 
         public string Package
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Package]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Package];
             set => this.Set((int)WixPayloadPropertiesTupleFields.Package, value);
         }
 
         public string Container
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Container]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Container];
             set => this.Set((int)WixPayloadPropertiesTupleFields.Container, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Name];
             set => this.Set((int)WixPayloadPropertiesTupleFields.Name, value);
         }
 
         public string Size
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Size]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.Size];
             set => this.Set((int)WixPayloadPropertiesTupleFields.Size, value);
         }
 
         public string DownloadUrl
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.DownloadUrl]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.DownloadUrl];
             set => this.Set((int)WixPayloadPropertiesTupleFields.DownloadUrl, value);
         }
 
         public string LayoutOnly
         {
-            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.LayoutOnly]?.Value;
+            get => (string)this.Fields[(int)WixPayloadPropertiesTupleFields.LayoutOnly];
             set => this.Set((int)WixPayloadPropertiesTupleFields.LayoutOnly, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
index 40065f55..1cd44a6a 100644
--- a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixProductSearchTupleFields.WixSearch_];
             set => this.Set((int)WixProductSearchTupleFields.WixSearch_, value);
         }
 
         public string Guid
         {
-            get => (string)this.Fields[(int)WixProductSearchTupleFields.Guid]?.Value;
+            get => (string)this.Fields[(int)WixProductSearchTupleFields.Guid];
             set => this.Set((int)WixProductSearchTupleFields.Guid, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixProductSearchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixProductSearchTupleFields.Attributes];
             set => this.Set((int)WixProductSearchTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
index 74e17d18..2e2c96f8 100644
--- a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string Property_
         {
-            get => (string)this.Fields[(int)WixPropertyTupleFields.Property_]?.Value;
+            get => (string)this.Fields[(int)WixPropertyTupleFields.Property_];
             set => this.Set((int)WixPropertyTupleFields.Property_, value);
         }
 
         public bool Admin
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Admin]?.Value;
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Admin];
             set => this.Set((int)WixPropertyTupleFields.Admin, value);
         }
 
         public bool Hidden
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Hidden]?.Value;
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Hidden];
             set => this.Set((int)WixPropertyTupleFields.Hidden, value);
         }
 
         public bool Secure
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Secure]?.Value;
+            get => (bool)this.Fields[(int)WixPropertyTupleFields.Secure];
             set => this.Set((int)WixPropertyTupleFields.Secure, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
index c23bf957..9947b527 100644
--- a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.WixSearch_];
             set => this.Set((int)WixRegistrySearchTupleFields.WixSearch_, value);
         }
 
         public int Root
         {
-            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Root]?.Value;
+            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Root];
             set => this.Set((int)WixRegistrySearchTupleFields.Root, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Key]?.Value;
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Key];
             set => this.Set((int)WixRegistrySearchTupleFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Value];
             set => this.Set((int)WixRegistrySearchTupleFields.Value, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixRegistrySearchTupleFields.Attributes];
             set => this.Set((int)WixRegistrySearchTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
index 5151aa2b..a7a2cf92 100644
--- a/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
@@ -47,7 +47,7 @@ namespace WixToolset.Data.Tuples
 
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixRelatedBundleTupleFields.BundleId]?.Value;
+            get => (string)this.Fields[(int)WixRelatedBundleTupleFields.BundleId];
             set => this.Set((int)WixRelatedBundleTupleFields.BundleId, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
index 05021a11..79e4dcac 100644
--- a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.WixSearch_];
             set => this.Set((int)WixSearchRelationTupleFields.WixSearch_, value);
         }
 
         public string ParentId_
         {
-            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentId_]?.Value;
+            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentId_];
             set => this.Set((int)WixSearchRelationTupleFields.ParentId_, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixSearchRelationTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixSearchRelationTupleFields.Attributes];
             set => this.Set((int)WixSearchRelationTupleFields.Attributes, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixSearchTuple.cs b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
index 887a7b0d..21970e40 100644
--- a/src/WixToolset.Data/Tuples/WixSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.WixSearch]?.Value;
+            get => (string)this.Fields[(int)WixSearchTupleFields.WixSearch];
             set => this.Set((int)WixSearchTupleFields.WixSearch, value);
         }
 
         public string Variable
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.Variable]?.Value;
+            get => (string)this.Fields[(int)WixSearchTupleFields.Variable];
             set => this.Set((int)WixSearchTupleFields.Variable, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.Condition]?.Value;
+            get => (string)this.Fields[(int)WixSearchTupleFields.Condition];
             set => this.Set((int)WixSearchTupleFields.Condition, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
index 5641f2b3..2964cfb2 100644
--- a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
@@ -41,13 +41,13 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.Table];
             set => this.Set((int)WixSimpleReferenceTupleFields.Table, value);
         }
 
         public string PrimaryKeys
         {
-            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.PrimaryKeys]?.Value;
+            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.PrimaryKeys];
             set => this.Set((int)WixSimpleReferenceTupleFields.PrimaryKeys, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
index 11131f2e..70bda370 100644
--- a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
@@ -41,13 +41,13 @@ namespace WixToolset.Data.Tuples
 
         public SequenceTable SequenceTable
         {
-            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]?.Value);
+            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]);
             set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value.ToString());
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)WixSuppressActionTupleFields.Action]?.Value;
+            get => (string)this.Fields[(int)WixSuppressActionTupleFields.Action];
             set => this.Set((int)WixSuppressActionTupleFields.Action, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
index c6f42eac..e591c19b 100644
--- a/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
@@ -37,7 +37,7 @@ namespace WixToolset.Data.Tuples
 
         public string WixSuppressModularization
         {
-            get => (string)this.Fields[(int)WixSuppressModularizationTupleFields.WixSuppressModularization]?.Value;
+            get => (string)this.Fields[(int)WixSuppressModularizationTupleFields.WixSuppressModularization];
             set => this.Set((int)WixSuppressModularizationTupleFields.WixSuppressModularization, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
index 64043ffe..93a59cce 100644
--- a/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Manufacturer]?.Value;
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Manufacturer];
             set => this.Set((int)WixUpdateRegistrationTupleFields.Manufacturer, value);
         }
 
         public string Department
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Department]?.Value;
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Department];
             set => this.Set((int)WixUpdateRegistrationTupleFields.Department, value);
         }
 
         public string ProductFamily
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.ProductFamily]?.Value;
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.ProductFamily];
             set => this.Set((int)WixUpdateRegistrationTupleFields.ProductFamily, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Name];
             set => this.Set((int)WixUpdateRegistrationTupleFields.Name, value);
         }
 
         public string Classification
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Classification]?.Value;
+            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Classification];
             set => this.Set((int)WixUpdateRegistrationTupleFields.Classification, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/WixVariableTuple.cs b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
index 6b6e7354..4af8a5ff 100644
--- a/src/WixToolset.Data/Tuples/WixVariableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
@@ -41,19 +41,19 @@ namespace WixToolset.Data.Tuples
 
         public string WixVariable
         {
-            get => (string)this.Fields[(int)WixVariableTupleFields.WixVariable]?.Value;
+            get => (string)this.Fields[(int)WixVariableTupleFields.WixVariable];
             set => this.Set((int)WixVariableTupleFields.WixVariable, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixVariableTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)WixVariableTupleFields.Value];
             set => this.Set((int)WixVariableTupleFields.Value, value);
         }
 
         public bool Overridable
         {
-            get => (bool)this.Fields[(int)WixVariableTupleFields.Overridable]?.Value;
+            get => (bool)this.Fields[(int)WixVariableTupleFields.Overridable];
             set => this.Set((int)WixVariableTupleFields.Overridable, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/_StreamsTuple.cs b/src/WixToolset.Data/Tuples/_StreamsTuple.cs
index 1f9d75e8..c581d11a 100644
--- a/src/WixToolset.Data/Tuples/_StreamsTuple.cs
+++ b/src/WixToolset.Data/Tuples/_StreamsTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public string Name
         {
-            get => (string)this.Fields[(int)_StreamsTupleFields.Name]?.Value;
+            get => (string)this.Fields[(int)_StreamsTupleFields.Name];
             set => this.Set((int)_StreamsTupleFields.Name, value);
         }
 
         public string Data
         {
-            get => (string)this.Fields[(int)_StreamsTupleFields.Data]?.Value;
+            get => (string)this.Fields[(int)_StreamsTupleFields.Data];
             set => this.Set((int)_StreamsTupleFields.Data, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs b/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
index 4ce3b63f..249afe84 100644
--- a/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
+++ b/src/WixToolset.Data/Tuples/_SummaryInformationTuple.cs
@@ -39,13 +39,13 @@ namespace WixToolset.Data.Tuples
 
         public int PropertyId
         {
-            get => (int)this.Fields[(int)_SummaryInformationTupleFields.PropertyId]?.Value;
+            get => (int)this.Fields[(int)_SummaryInformationTupleFields.PropertyId];
             set => this.Set((int)_SummaryInformationTupleFields.PropertyId, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)_SummaryInformationTupleFields.Value]?.Value;
+            get => (string)this.Fields[(int)_SummaryInformationTupleFields.Value];
             set => this.Set((int)_SummaryInformationTupleFields.Value, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/_TransformViewTuple.cs b/src/WixToolset.Data/Tuples/_TransformViewTuple.cs
index e3355062..8a750dfb 100644
--- a/src/WixToolset.Data/Tuples/_TransformViewTuple.cs
+++ b/src/WixToolset.Data/Tuples/_TransformViewTuple.cs
@@ -45,31 +45,31 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)_TransformViewTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Table];
             set => this.Set((int)_TransformViewTupleFields.Table, value);
         }
 
         public string Column
         {
-            get => (string)this.Fields[(int)_TransformViewTupleFields.Column]?.Value;
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Column];
             set => this.Set((int)_TransformViewTupleFields.Column, value);
         }
 
         public string Row
         {
-            get => (string)this.Fields[(int)_TransformViewTupleFields.Row]?.Value;
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Row];
             set => this.Set((int)_TransformViewTupleFields.Row, value);
         }
 
         public string Data
         {
-            get => (string)this.Fields[(int)_TransformViewTupleFields.Data]?.Value;
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Data];
             set => this.Set((int)_TransformViewTupleFields.Data, value);
         }
 
         public string Current
         {
-            get => (string)this.Fields[(int)_TransformViewTupleFields.Current]?.Value;
+            get => (string)this.Fields[(int)_TransformViewTupleFields.Current];
             set => this.Set((int)_TransformViewTupleFields.Current, value);
         }
     }
diff --git a/src/WixToolset.Data/Tuples/_ValidationTuple.cs b/src/WixToolset.Data/Tuples/_ValidationTuple.cs
index 3bcd064c..869b19d8 100644
--- a/src/WixToolset.Data/Tuples/_ValidationTuple.cs
+++ b/src/WixToolset.Data/Tuples/_ValidationTuple.cs
@@ -55,61 +55,61 @@ namespace WixToolset.Data.Tuples
 
         public string Table
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Table]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Table];
             set => this.Set((int)_ValidationTupleFields.Table, value);
         }
 
         public string Column
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Column]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Column];
             set => this.Set((int)_ValidationTupleFields.Column, value);
         }
 
         public string Nullable
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Nullable]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Nullable];
             set => this.Set((int)_ValidationTupleFields.Nullable, value);
         }
 
         public int MinValue
         {
-            get => (int)this.Fields[(int)_ValidationTupleFields.MinValue]?.Value;
+            get => (int)this.Fields[(int)_ValidationTupleFields.MinValue];
             set => this.Set((int)_ValidationTupleFields.MinValue, value);
         }
 
         public int MaxValue
         {
-            get => (int)this.Fields[(int)_ValidationTupleFields.MaxValue]?.Value;
+            get => (int)this.Fields[(int)_ValidationTupleFields.MaxValue];
             set => this.Set((int)_ValidationTupleFields.MaxValue, value);
         }
 
         public string KeyTable
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.KeyTable]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.KeyTable];
             set => this.Set((int)_ValidationTupleFields.KeyTable, value);
         }
 
         public int KeyColumn
         {
-            get => (int)this.Fields[(int)_ValidationTupleFields.KeyColumn]?.Value;
+            get => (int)this.Fields[(int)_ValidationTupleFields.KeyColumn];
             set => this.Set((int)_ValidationTupleFields.KeyColumn, value);
         }
 
         public string Category
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Category]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Category];
             set => this.Set((int)_ValidationTupleFields.Category, value);
         }
 
         public string Set
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Set]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Set];
             set => this.Set((int)_ValidationTupleFields.Set, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)_ValidationTupleFields.Description]?.Value;
+            get => (string)this.Fields[(int)_ValidationTupleFields.Description];
             set => this.Set((int)_ValidationTupleFields.Description, value);
         }
     }