Additional IR updates

4 files changed, 12 insertions, 10 deletions

diff --git a/src/WixToolset.Data/Tuples/WixFileTuple.cs b/src/WixToolset.Data/Tuples/WixFileTuple.cs
index 5ffc5d7f..88dc4c82 100644
--- a/src/WixToolset.Data/Tuples/WixFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileTuple.cs
@@ -133,7 +133,7 @@ namespace WixToolset.Data.Tuples
 
         public string Source
         {
-            get => (string)this.Fields[(int)WixFileTupleFields.Source]?.Value;
+            get => this.Fields[(int)WixFileTupleFields.Source].AsPath()?.Path;
             set => this.Set((int)WixFileTupleFields.Source, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
index 602acc0e..8f44e6a4 100644
--- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
@@ -15,7 +15,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Directory_), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Feature_), IntermediateFieldType.String),
             },
@@ -79,9 +79,9 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixMergeTupleFields.DiskId, value);
         }
 
-        public int FileCompression
+        public bool? FileCompression
         {
-            get => (int)this.Fields[(int)WixMergeTupleFields.FileCompression]?.Value;
+            get => (bool?)this.Fields[(int)WixMergeTupleFields.FileCompression]?.Value;
             set => this.Set((int)WixMergeTupleFields.FileCompression, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
index 81b9573d..f589a9fc 100644
--- a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Data
             {
                 new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ProductCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ClientPatchId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool),
                 new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
             },
             typeof(WixPatchIdTuple));
@@ -53,9 +53,9 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
         }
 
-        public int OptimizePatchSizeForLargeFiles
+        public bool OptimizePatchSizeForLargeFiles
         {
-            get => (int)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]?.Value;
+            get => (bool)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles]?.Value;
             set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
index ad8b443e..11131f2e 100644
--- a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
@@ -19,6 +19,8 @@ namespace WixToolset.Data
 
 namespace WixToolset.Data.Tuples
 {
+    using System;
+
     public enum WixSuppressActionTupleFields
     {
         SequenceTable,
@@ -37,10 +39,10 @@ namespace WixToolset.Data.Tuples
 
         public IntermediateField this[WixSuppressActionTupleFields index] => this.Fields[(int)index];
 
-        public string SequenceTable
+        public SequenceTable SequenceTable
         {
-            get => (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]?.Value;
-            set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value);
+            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]?.Value);
+            set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value.ToString());
         }
 
         public string Action