General cleanup.

Try not to send strings to specify the tuple or table.
Try to avoid using the Set method on tuples.
Always create new tuples and add them to the section in the same line.

27 files changed, 660 insertions, 891 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
index 7f36dbcc..e228b296 100644
--- a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
@@ -56,14 +56,14 @@ namespace WixToolset.Core.Burn.Bind
 
                 if (this.Facades.TryGetValue(packageId, out var facade))
                 {
-                    var dependency = new ProvidesDependencyTuple(wixDependencyProviderTuple.SourceLineNumbers, wixDependencyProviderTuple.Id)
+                    var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(wixDependencyProviderTuple.SourceLineNumbers, wixDependencyProviderTuple.Id)
                     {
                         PackageRef = packageId,
                         Key = wixDependencyProviderTuple.ProviderKey,
                         Version = wixDependencyProviderTuple.Version,
                         DisplayName = wixDependencyProviderTuple.DisplayName,
                         Attributes = (int)wixDependencyProviderTuple.Attributes
-                    };
+                    });
 
                     if (String.IsNullOrEmpty(dependency.Key))
                     {
@@ -94,8 +94,6 @@ namespace WixToolset.Core.Burn.Bind
                     {
                         dependency.DisplayName = facade.PackageTuple.DisplayName;
                     }
-
-                    this.Section.Tuples.Add(dependency);
                 }
             }
 
@@ -121,15 +119,13 @@ namespace WixToolset.Core.Burn.Bind
 
                 if (!String.IsNullOrEmpty(key) && !this.DependencyTuplesByKey.ContainsKey(key))
                 {
-                    var dependency = new ProvidesDependencyTuple(facade.PackageTuple.SourceLineNumbers, facade.PackageTuple.Id)
+                    var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(facade.PackageTuple.SourceLineNumbers, facade.PackageTuple.Id)
                     {
                         PackageRef = facade.PackageId,
                         Key = key,
                         Version = facade.PackageTuple.Version,
                         DisplayName = facade.PackageTuple.DisplayName
-                    };
-
-                    this.Section.Tuples.Add(dependency);
+                    });
 
                     this.DependencyTuplesByKey.Add(dependency.Key, dependency);
                 }
diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
index b3a29e15..6e08c68e 100644
--- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
@@ -102,17 +102,12 @@ namespace WixToolset.Core.Burn.Bundles
 
             if (slipstreamMspIds.Add(id.Id))
             {
-                var slipstreamTuple = new WixBundleSlipstreamMspTuple(patchTargetCode.SourceLineNumbers)
+                this.Section.AddTuple(new WixBundleSlipstreamMspTuple(patchTargetCode.SourceLineNumbers)
                 {
                     TargetPackageRef = msiPackage.Id.Id,
-                    MspPackageRef = patchTargetCode.PackageRef
-                };
+                    MspPackageRef = patchTargetCode.PackageRef,
+                });
 
-                //var slipstreamMspRow = SlipstreamMspTable.CreateRow(tuple.SourceLineNumbers, false);
-                //slipstreamMspRow[0] = msi.ChainPackageId;
-                //slipstreamMspRow[1] = tuple.MspPackageId;
-
-                this.Section.Tuples.Add(slipstreamTuple);
                 return true;
             }
 
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index 1ef5bb2e..5ef75b3e 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -285,7 +285,7 @@ namespace WixToolset.Core.Burn.Bundles
         {
             var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BADataFileName);
 
-            var tuple = new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+            var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
             {
                 Name = BurnCommon.BADataFileName,
                 SourceFile = new IntermediateFieldPathValue { Path = baManifestPath },
@@ -294,7 +294,7 @@ namespace WixToolset.Core.Burn.Bundles
                 ContainerRef = BurnConstants.BurnUXContainerName,
                 EmbeddedId = String.Format(CultureInfo.InvariantCulture, BurnCommon.BurnUXContainerEmbeddedIdFormat, this.LastUXPayloadIndex),
                 Packaging = PackagingType.Embedded,
-            };
+            });
 
             var fileInfo = new FileInfo(baManifestPath);
 
@@ -302,8 +302,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             tuple.Hash = BundleHashAlgorithm.Hash(fileInfo);
 
-            this.Section.Tuples.Add(tuple);
-
             return tuple;
         }
     }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
index b608c03d..73ad5174 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
@@ -124,7 +124,7 @@ namespace WixToolset.Core.Burn.Bundles
         {
             var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BundleExtensionDataFileName);
 
-            var tuple = new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+            var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
             {
                 Name = BurnCommon.BundleExtensionDataFileName,
                 SourceFile = new IntermediateFieldPathValue { Path = bextManifestPath },
@@ -133,7 +133,7 @@ namespace WixToolset.Core.Burn.Bundles
                 ContainerRef = BurnConstants.BurnUXContainerName,
                 EmbeddedId = String.Format(CultureInfo.InvariantCulture, BurnCommon.BurnUXContainerEmbeddedIdFormat, this.LastUXPayloadIndex),
                 Packaging = PackagingType.Embedded,
-            };
+            });
 
             var fileInfo = new FileInfo(bextManifestPath);
 
@@ -141,8 +141,6 @@ namespace WixToolset.Core.Burn.Bundles
 
             tuple.Hash = BundleHashAlgorithm.Hash(fileInfo);
 
-            this.Section.Tuples.Add(tuple);
-
             return tuple;
         }
     }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index d800a19a..0754fbc6 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -283,7 +283,7 @@ namespace WixToolset.Core.Burn.Bundles
                             attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive ? WixBundleRelatedPackageAttributes.MaxInclusive : 0;
                             attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive ? WixBundleRelatedPackageAttributes.LangInclusive : 0;
 
-                            var related = new WixBundleRelatedPackageTuple(this.Facade.PackageTuple.SourceLineNumbers)
+                            this.Section.AddTuple(new WixBundleRelatedPackageTuple(this.Facade.PackageTuple.SourceLineNumbers)
                             {
                                 PackageRef = this.Facade.PackageId,
                                 RelatedId = record.GetString(1),
@@ -291,7 +291,7 @@ namespace WixToolset.Core.Burn.Bundles
                                 MaxVersion = record.GetString(3),
                                 Languages = record.GetString(4),
                                 Attributes = attributes,
-                            };
+                            });
                         }
                     }
                 }
@@ -358,7 +358,7 @@ namespace WixToolset.Core.Burn.Bundles
                                         }
                                     }
 
-                                    var feature = new WixBundleMsiFeatureTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName))
+                                    this.Section.AddTuple(new WixBundleMsiFeatureTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName))
                                     {
                                         PackageRef = this.Facade.PackageId,
                                         Name = featureName,
@@ -370,7 +370,7 @@ namespace WixToolset.Core.Burn.Bundles
                                         Directory = allFeaturesResultRecord.GetString(7),
                                         Attributes = allFeaturesResultRecord.GetInteger(8),
                                         Size = size
-                                    };
+                                    });
                                 }
                             }
                         }
@@ -397,7 +397,7 @@ namespace WixToolset.Core.Burn.Bundles
                             var generatedId = Common.GenerateIdentifier("cab", packagePayload.Id.Id, cabinet);
                             var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal);
 
-                            var tuple = new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+                            this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
                             {
                                 Name = cabinetName,
                                 SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile },
@@ -409,9 +409,7 @@ namespace WixToolset.Core.Burn.Bundles
                                 EnableSignatureValidation = packagePayload.EnableSignatureValidation,
                                 Packaging = packagePayload.Packaging,
                                 ParentPackagePayloadRef = packagePayload.Id.Id,
-                            };
-
-                            this.Section.Tuples.Add(tuple);
+                            });
                         }
                     }
                 }
@@ -477,7 +475,7 @@ namespace WixToolset.Core.Burn.Bundles
                                     var generatedId = Common.GenerateIdentifier("f", packagePayload.Id.Id, record.GetString(2));
                                     var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal);
 
-                                    var tuple = new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+                                    this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
                                     {
                                         Name = name,
                                         SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile },
@@ -489,9 +487,7 @@ namespace WixToolset.Core.Burn.Bundles
                                         EnableSignatureValidation = packagePayload.EnableSignatureValidation,
                                         Packaging = packagePayload.Packaging,
                                         ParentPackagePayloadRef = packagePayload.Id.Id,
-                                    };
-
-                                    this.Section.Tuples.Add(tuple);
+                                    });
                                 }
                             }
 
@@ -506,14 +502,12 @@ namespace WixToolset.Core.Burn.Bundles
 
         private void AddMsiProperty(WixBundleMsiPackageTuple msiPackage, string name, string value)
         {
-            var tuple = new WixBundleMsiPropertyTuple(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name))
+            this.Section.AddTuple(new WixBundleMsiPropertyTuple(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name))
             {
                 PackageRef = msiPackage.Id.Id,
                 Name = name,
-                Value = value
-            };
-
-            this.Section.Tuples.Add(tuple);
+                Value = value,
+            });
         }
 
         private void ImportDependencyProviders(WixBundleMsiPackageTuple msiPackage, Dtf.Database db)
@@ -535,7 +529,7 @@ namespace WixToolset.Core.Burn.Bundles
                             }
 
                             // Import the provider key and attributes.
-                            var tuple = new ProvidesDependencyTuple(msiPackage.SourceLineNumbers)
+                            this.Section.AddTuple(new ProvidesDependencyTuple(msiPackage.SourceLineNumbers)
                             {
                                 PackageRef = msiPackage.Id.Id,
                                 Key = record.GetString(1),
@@ -543,9 +537,7 @@ namespace WixToolset.Core.Burn.Bundles
                                 DisplayName = record.GetString(3) ?? this.Facade.PackageTuple.DisplayName,
                                 Attributes = record.GetInteger(4),
                                 Imported = true
-                            };
-
-                            this.Section.Tuples.Add(tuple);
+                            });
                         }
                     }
                 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
index dc832d40..5acffe33 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
@@ -127,14 +127,12 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (uniqueTargetCodes.Add(targetCode))
                 {
-                    var tuple = new WixBundlePatchTargetCodeTuple(packagePayload.SourceLineNumbers)
+                    this.Section.AddTuple(new WixBundlePatchTargetCodeTuple(packagePayload.SourceLineNumbers)
                     {
                         PackageRef = packagePayload.Id.Id,
                         TargetCode = targetCode,
                         Attributes = attributes
-                    };
-
-                    this.Section.Tuples.Add(tuple);
+                    });
                 }
             }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs
index 6cc4153f..ba844da4 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs
@@ -26,13 +26,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 if (!createFolderTuplesByComponentRef.Contains(componentTuple.Id.Id))
                 {
-                    var createFolderTuple = new CreateFolderTuple(componentTuple.SourceLineNumbers)
+                    this.Section.AddTuple(new CreateFolderTuple(componentTuple.SourceLineNumbers)
                     {
                         DirectoryRef = componentTuple.DirectoryRef,
                         ComponentRef = componentTuple.Id.Id,
-                    };
-
-                    this.Section.Tuples.Add(createFolderTuple);
+                    });
                 }
             }
         }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
index 2bfd587f..ae7e5788 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
@@ -71,12 +71,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // When building merge module, all the files go to "#MergeModule.CABinet".
             if (SectionType.Module == this.Section.Type)
             {
-                var mergeModuleMediaRow = new MediaTuple();
-                mergeModuleMediaRow.Cabinet = "#MergeModule.CABinet";
-
-                this.Section.Tuples.Add(mergeModuleMediaRow);
+                var mergeModuleMediaTuple = this.Section.AddTuple(new MediaTuple
+                {
+                    Cabinet = "#MergeModule.CABinet",
+                });
 
-                filesByCabinetMedia.Add(mergeModuleMediaRow, new List<FileFacade>(this.FileFacades));
+                filesByCabinetMedia.Add(mergeModuleMediaTuple, new List<FileFacade>(this.FileFacades));
             }
             else if (mediaTemplateTable.Count == 0)
             {
@@ -212,13 +212,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // If there are uncompressed files and no MediaRow, create a default one.
             if (uncompressedFiles.Count > 0 && !this.Section.Tuples.OfType<MediaTuple>().Any())
             {
-                var defaultMediaRow = new MediaTuple(null, new Identifier(AccessModifier.Private, 1))
+                var defaultMediaRow = this.Section.AddTuple(new MediaTuple(null, new Identifier(AccessModifier.Private, 1))
                 {
-                    DiskId = 1
-                };
+                    DiskId = 1,
+                });
 
                 mediaRows.Add(1, defaultMediaRow);
-                this.Section.Tuples.Add(defaultMediaRow);
             }
         }
 
@@ -298,14 +297,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         /// <returns></returns>
         private MediaTuple AddMediaRow(WixMediaTemplateTuple mediaTemplateTuple, int cabIndex)
         {
-            var currentMediaTuple = new MediaTuple(mediaTemplateTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex));
-            currentMediaTuple.DiskId = cabIndex;
-            currentMediaTuple.Cabinet = String.Format(CultureInfo.InvariantCulture, this.CabinetNameTemplate, cabIndex);
-            currentMediaTuple.CompressionLevel = mediaTemplateTuple.CompressionLevel;
-
-            this.Section.Tuples.Add(currentMediaTuple);
-
-            return currentMediaTuple;
+            return this.Section.AddTuple(new MediaTuple(mediaTemplateTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex))
+            {
+                DiskId = cabIndex,
+                Cabinet = String.Format(CultureInfo.InvariantCulture, this.CabinetNameTemplate, cabIndex),
+                CompressionLevel = mediaTemplateTuple.CompressionLevel,
+            });
         }
     }
 }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
index f4fa510f..ca6bfd2f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
@@ -225,7 +225,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Put the summary information that was extracted back in now that it is updated.
             foreach (var readSummaryInfo in summaryInfo.Values.OrderBy(s => s.PropertyId))
             {
-                section.Tuples.Add(readSummaryInfo);
+                section.AddTuple(readSummaryInfo);
             }
 
             this.SubStorages = subStorages;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
index 8aa6047f..7a9dbc69 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs
@@ -44,10 +44,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.InstallerVersion = 0;
             this.ModularizationGuid = null;
 
-            bool foundCreateDataTime = false;
-            bool foundLastSaveDataTime = false;
-            bool foundCreatingApplication = false;
-            string now = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture);
+            var foundCreateDataTime = false;
+            var foundLastSaveDataTime = false;
+            var foundCreatingApplication = false;
+            var now = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture);
 
             foreach (var summaryInformationTuple in this.Section.Tuples.OfType<SummaryInformationTuple>())
             {
@@ -110,31 +110,31 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // add a summary information row for the create time/date property if its not already set
             if (!foundCreateDataTime)
             {
-                var createTimeDateRow = new SummaryInformationTuple(null);
-                createTimeDateRow.PropertyId = SumaryInformationType.Created;
-                createTimeDateRow.Value = now;
-
-                this.Section.Tuples.Add(createTimeDateRow);
+                this.Section.AddTuple(new SummaryInformationTuple(null)
+                {
+                    PropertyId = SumaryInformationType.Created,
+                    Value = now,
+                });
             }
 
             // add a summary information row for the last save time/date property if its not already set
             if (!foundLastSaveDataTime)
             {
-                var lastSaveTimeDateRow = new SummaryInformationTuple(null);
-                lastSaveTimeDateRow.PropertyId = SumaryInformationType.LastSaved;
-                lastSaveTimeDateRow.Value = now;
-
-                this.Section.Tuples.Add(lastSaveTimeDateRow);
+                this.Section.AddTuple(new SummaryInformationTuple(null)
+                {
+                    PropertyId = SumaryInformationType.LastSaved,
+                    Value = now,
+                });
             }
 
             // add a summary information row for the creating application property if its not already set
             if (!foundCreatingApplication)
             {
-                var creatingApplicationRow = new SummaryInformationTuple(null);
-                creatingApplicationRow.PropertyId = SumaryInformationType.CreatingApplication;
-                creatingApplicationRow.Value = String.Format(CultureInfo.InvariantCulture, AppCommon.GetCreatingApplicationString());
-
-                this.Section.Tuples.Add(creatingApplicationRow);
+                this.Section.AddTuple(new SummaryInformationTuple(null)
+                {
+                    PropertyId = SumaryInformationType.CreatingApplication,
+                    Value = String.Format(CultureInfo.InvariantCulture, AppCommon.GetCreatingApplicationString()),
+                });
             }
         }
     }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
index 0d165f80..5b4fe9e5 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
@@ -57,26 +57,26 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (0 < adminProperties.Count)
             {
-                var tuple = new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties"));
-                tuple.Value = String.Join(";", adminProperties);
-
-                this.Section.Tuples.Add(tuple);
+                this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties"))
+                {
+                    Value = String.Join(";", adminProperties),
+                });
             }
 
             if (0 < secureProperties.Count)
             {
-                var tuple = new PropertyTuple(null, new Identifier(AccessModifier.Private, "SecureCustomProperties"));
-                tuple.Value = String.Join(";", secureProperties);
-
-                this.Section.Tuples.Add(tuple);
+                this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "SecureCustomProperties"))
+                {
+                    Value = String.Join(";", secureProperties),
+                });
             }
 
             if (0 < hiddenProperties.Count)
             {
-                var tuple = new PropertyTuple(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties"));
-                tuple.Value = String.Join(";", hiddenProperties);
-
-                this.Section.Tuples.Add(tuple);
+                this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties"))
+                {
+                    Value = String.Join(";", hiddenProperties)
+                });
             }
         }
     }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index fe014b0b..a5055209 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -186,7 +186,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             foreach (var action in scheduledActionTuples)
             {
-                this.Section.Tuples.Add(action);
+                this.Section.AddTuple(action);
             }
         }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 81d46b41..7ecd58d7 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -158,8 +158,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                     if (null == facade.Hash)
                     {
-                        facade.Hash = new MsiFileHashTuple(facade.SourceLineNumber, facade.Identifier);
-                        this.Section.Tuples.Add(facade.Hash);
+                        facade.Hash = this.Section.AddTuple(new MsiFileHashTuple(facade.SourceLineNumber, facade.Identifier));
                     }
 
                     facade.Hash.Options = 0;
@@ -337,23 +336,24 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                 // override directly authored value
                 var lookup = String.Concat(facade.ComponentRef, "/", name);
-                if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameRow))
+                if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameTuple))
                 {
-                    assemblyNameRow = new MsiAssemblyNameTuple(facade.SourceLineNumber);
-                    assemblyNameRow.ComponentRef = facade.ComponentRef;
-                    assemblyNameRow.Name = name;
-                    assemblyNameRow.Value = value;
+                    assemblyNameTuple = this.Section.AddTuple(new MsiAssemblyNameTuple(facade.SourceLineNumber)
+                    {
+                        ComponentRef = facade.ComponentRef,
+                        Name = name,
+                        Value = value,
+                    });
 
                     if (null == facade.AssemblyNames)
                     {
                         facade.AssemblyNames = new List<MsiAssemblyNameTuple>();
                     }
 
-                    facade.AssemblyNames.Add(assemblyNameRow);
-                    this.Section.Tuples.Add(assemblyNameRow);
+                    facade.AssemblyNames.Add(assemblyNameTuple);
                 }
 
-                assemblyNameRow.Value = value;
+                assemblyNameTuple.Value = value;
 
                 if (this.VariableCache != null)
                 {
diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs
index e6dd538b..a670714a 100644
--- a/src/WixToolset.Core/Binder.cs
+++ b/src/WixToolset.Core/Binder.cs
@@ -81,16 +81,16 @@ namespace WixToolset.Core
             var executingAssembly = Assembly.GetExecutingAssembly();
             var fileVersion = FileVersionInfo.GetVersionInfo(executingAssembly.Location);
 
-            var buildInfoTuple = new WixBuildInfoTuple();
-            buildInfoTuple.WixVersion = fileVersion.FileVersion;
-            buildInfoTuple.WixOutputFile = outputFile;
+            var buildInfoTuple = entrySection.AddTuple(new WixBuildInfoTuple()
+            {
+                WixVersion = fileVersion.FileVersion,
+                WixOutputFile = outputFile,
+            });
 
             if (!String.IsNullOrEmpty(outputPdbPath))
             {
                 buildInfoTuple.WixPdbFile = outputPdbPath;
             }
-
-            entrySection.Tuples.Add(buildInfoTuple);
         }
     }
 }
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 9db938e1..d4ad3279 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Core
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -163,7 +164,7 @@ namespace WixToolset.Core
                 this.Core = null;
             }
 
-            target.UpdateLevel(IntermediateLevels.Compiled);
+            target.UpdateLevel(Data.IntermediateLevels.Compiled);
 
             return this.Messaging.EncounteredError ? null : target;
         }
@@ -324,13 +325,11 @@ namespace WixToolset.Core
                     this.Core.Write(ErrorMessages.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id));
                 }
 
-                var tuple = new AppSearchTuple(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature))
+                this.Core.AddTuple(new AppSearchTuple(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature))
                 {
                     PropertyRef = propertyId.Id,
                     SignatureRef = signature
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -371,7 +370,7 @@ namespace WixToolset.Core
             {
                 var section = this.Core.ActiveSection;
 
-                // Add the row to a separate section if requested.
+                // Add the tuple to a separate section if requested.
                 if (fragment)
                 {
                     var id = String.Concat(this.Core.ActiveSection.Id, ".", propertyId.Id);
@@ -379,26 +378,24 @@ namespace WixToolset.Core
                     section = this.Core.CreateSection(id, SectionType.Fragment, this.Core.ActiveSection.Codepage, this.Context.CompilationId);
 
                     // Reference the property in the active section.
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "Property", propertyId.Id);
+                    this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, propertyId.Id);
                 }
 
-                // Allow row to exist with no value so that PropertyRefs can be made for *Search elements
-                // the linker will remove these rows before the final output is created.
-                var tuple = new PropertyTuple(sourceLineNumbers, propertyId)
+                // Allow tuple to exist with no value so that PropertyRefs can be made for *Search elements
+                // the linker will remove these tuples before the final output is created.
+                section.AddTuple(new PropertyTuple(sourceLineNumbers, propertyId)
                 {
                     Value = value,
-                };
-
-                section.Tuples.Add(tuple);
+                });
 
                 if (admin || hidden || secure)
                 {
-                    this.AddWixPropertyRow(sourceLineNumbers, propertyId, admin, secure, hidden, section);
+                    this.AddWixPropertyTuple(sourceLineNumbers, propertyId, admin, secure, hidden, section);
                 }
             }
         }
 
-        private void AddWixPropertyRow(SourceLineNumber sourceLineNumbers, Identifier property, bool admin, bool secure, bool hidden, IntermediateSection section = null)
+        private void AddWixPropertyTuple(SourceLineNumber sourceLineNumbers, Identifier property, bool admin, bool secure, bool hidden, IntermediateSection section = null)
         {
             if (secure && property.Id != property.Id.ToUpperInvariant())
             {
@@ -409,18 +406,16 @@ namespace WixToolset.Core
             {
                 section = this.Core.ActiveSection;
 
-                this.Core.EnsureTable(sourceLineNumbers, "Property"); // Property table is always required when using WixProperty table.
+                this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Property); // Property table is always required when using WixProperty table.
             }
 
-            var tuple = new WixPropertyTuple(sourceLineNumbers)
+            section.AddTuple(new WixPropertyTuple(sourceLineNumbers)
             {
                 PropertyRef = property.Id,
                 Admin = admin,
                 Hidden = hidden,
                 Secure = secure
-            };
-
-            section.Tuples.Add(tuple);
+            });
         }
 
         /// <summary>
@@ -550,7 +545,7 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new AppIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, appId))
+                    this.Core.AddTuple(new AppIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, appId))
                     {
                         AppId = appId,
                         RemoteServerName = remoteServerName,
@@ -558,10 +553,8 @@ namespace WixToolset.Core
                         ServiceParameters = serviceParameters,
                         DllSurrogate = dllSurrogate,
                         ActivateAtStorage = activateAtStorage,
-                        RunAsInteractiveUser = runAsInteractiveUser
-                    };
-
-                    this.Core.AddTuple(tuple);
+                        RunAsInteractiveUser = runAsInteractiveUser,
+                    });
                 }
             }
             else if (YesNoType.No == advertise)
@@ -650,14 +643,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id))
+                this.Core.AddTuple(new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id))
                 {
                     ComponentRef = componentId,
                     Name = id,
-                    Value = value
-                };
-
-                this.Core.AddTuple(tuple);
+                    Value = value,
+                });
             }
         }
 
@@ -739,12 +730,10 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new BinaryTuple(sourceLineNumbers, id)
+                var tuple = this.Core.AddTuple(new BinaryTuple(sourceLineNumbers, id)
                 {
                     Data = new IntermediateFieldPathValue { Path = sourceFile }
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (YesNoType.Yes == suppressModularization)
                 {
@@ -820,7 +809,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddTuple(new IconTuple(sourceLineNumbers, id)
                 {
-                    Data = new IntermediateFieldPathValue { Path = sourceFile }
+                    Data = new IntermediateFieldPathValue { Path = sourceFile },
                 });
             }
 
@@ -844,7 +833,7 @@ namespace WixToolset.Core
                     {
                     case "Property":
                         property = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Property", property);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, property);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -940,15 +929,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixInstanceTransformsTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new WixInstanceTransformsTuple(sourceLineNumbers, id)
                 {
                     PropertyId = propertyId,
                     ProductCode = productCode,
                     ProductName = productName,
                     UpgradeCode = upgradeCode
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -979,7 +966,7 @@ namespace WixToolset.Core
                         break;
                     case "Feature":
                         feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Feature", feature);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, feature);
                         break;
                     case "Qualifier":
                         qualifier = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -1009,16 +996,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new PublishComponentTuple(sourceLineNumbers)
+                this.Core.AddTuple(new PublishComponentTuple(sourceLineNumbers)
                 {
                     ComponentId = id,
                     Qualifier = qualifier,
                     ComponentRef = componentId,
                     AppData = appData,
                     FeatureRef = feature ?? Guid.Empty.ToString("B"),
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -1195,7 +1180,7 @@ namespace WixToolset.Core
 
             if (!String.IsNullOrEmpty(localFileServer))
             {
-                this.Core.CreateSimpleReference(sourceLineNumbers, "File", localFileServer);
+                this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, localFileServer);
             }
 
             // Local variables used strictly for child node processing.
@@ -1268,7 +1253,7 @@ namespace WixToolset.Core
                 {
                     foreach (var context in contexts)
                     {
-                        var tuple = new ClassTuple(sourceLineNumbers)
+                        var tuple = this.Core.AddTuple(new ClassTuple(sourceLineNumbers)
                         {
                             CLSID = classId,
                             Context = context,
@@ -1280,26 +1265,24 @@ namespace WixToolset.Core
                             Argument = argument,
                             FeatureRef = Guid.Empty.ToString("B"),
                             RelativePath = YesNoType.Yes == relativePath,
-                        };
+                        });
 
                         if (null != appId)
                         {
                             tuple.AppIdRef = appId;
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "AppId", appId);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.AppId, appId);
                         }
 
                         if (null != icon)
                         {
                             tuple.IconRef = icon;
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon);
                         }
 
                         if (CompilerConstants.IntegerNotSet != iconIndex)
                         {
                             tuple.IconIndex = iconIndex;
                         }
-
-                        this.Core.AddTuple(tuple);
                     }
                 }
             }
@@ -1379,7 +1362,7 @@ namespace WixToolset.Core
 
                     if (null != icon) // ClassId default icon
                     {
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", icon);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, icon);
 
                         icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon);
 
@@ -1709,7 +1692,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new UpgradeTuple(sourceLineNumbers)
+                this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers)
                 {
                     UpgradeCode = upgradeCode,
                     VersionMin = minimum,
@@ -1720,9 +1703,7 @@ namespace WixToolset.Core
                     ExcludeLanguages = excludeLanguages,
                     VersionMaxInclusive = maxInclusive,
                     VersionMinInclusive = minInclusive,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -1862,7 +1843,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                         }
                         oneChild = true;
-                        var newId = this.ParseSimpleRefElement(child, "Signature"); // FileSearch signatures override parent signatures
+                        var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures
                         id = new Identifier(AccessModifier.Private, newId);
                         signature = null;
                         break;
@@ -1879,16 +1860,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RegLocatorTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RegLocatorTuple(sourceLineNumbers, id)
                 {
                     Root = root.Value,
                     Key = key,
                     Name = name,
                     Type = type.Value,
-                    Win64 = search64bit
-                };
-
-                this.Core.AddTuple(tuple);
+                    Win64 = search64bit,
+                });
             }
 
             return signature;
@@ -1912,7 +1891,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "RegLocator", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.RegLocator, id);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -2524,7 +2503,7 @@ namespace WixToolset.Core
             // finally add the Component table row
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ComponentTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new ComponentTuple(sourceLineNumbers, id)
                 {
                     ComponentId = guid,
                     DirectoryRef = directoryId,
@@ -2539,10 +2518,8 @@ namespace WixToolset.Core
                     Shared = shared,
                     Transitive = transitive,
                     UninstallWhenSuperseded = uninstallWhenSuperseded,
-                    Win64 = win64
-                };
-
-                this.Core.AddTuple(tuple);
+                    Win64 = win64,
+                });
 
                 if (multiInstance)
                 {
@@ -2554,26 +2531,22 @@ namespace WixToolset.Core
 
                 if (0 < symbols.Count)
                 {
-                    var tupleDelaPatch = new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Component, id.Id))
+                    this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Component, id.Id))
                     {
                         SymbolType = SymbolPathType.Component,
                         SymbolId = id.Id,
-                        SymbolPaths = String.Join(";", symbols)
-                    };
-
-                    this.Core.AddTuple(tupleDelaPatch);
+                        SymbolPaths = String.Join(";", symbols),
+                    });
                 }
 
                 // Complus
                 if (CompilerConstants.IntegerNotSet != comPlusBits)
                 {
-                    var complusTuple = new ComplusTuple(sourceLineNumbers)
+                    this.Core.AddTuple(new ComplusTuple(sourceLineNumbers)
                     {
                         ComponentRef = id.Id,
                         ExpType = comPlusBits,
-                    };
-
-                    this.Core.AddTuple(complusTuple);
+                    });
                 }
 
                 // if this is a module, automatically add this component to the references to ensure it gets in the ModuleComponents table
@@ -2698,7 +2671,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixComponentGroup", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixComponentGroup, id);
                         break;
                     case "Primary":
                         primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -2747,7 +2720,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Component", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Component, id);
                         break;
                     case "Primary":
                         primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -2871,7 +2844,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                         }
                         oneChild = true;
-                        var newId = this.ParseSimpleRefElement(child, "Signature"); // FileSearch signatures override parent signatures
+                        var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures
                         id = new Identifier(AccessModifier.Private, newId);
                         signature = null;
                         break;
@@ -2888,18 +2861,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new CompLocatorTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new CompLocatorTuple(sourceLineNumbers, id)
                 {
                     SignatureRef = id.Id,
                     ComponentId = componentId,
                     Type = type,
-                };
-
-                this.Core.AddTuple(tuple);
-
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.CompLocator, id);
-                //row.Set(1, componentId);
-                //row.Set(2, type);
+                });
             }
 
             return signature;
@@ -2965,13 +2932,11 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new CreateFolderTuple(sourceLineNumbers)
+                this.Core.AddTuple(new CreateFolderTuple(sourceLineNumbers)
                 {
                     DirectoryRef = directoryId,
-                    ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
+                    ComponentRef = componentId,
+                });
             }
 
             return directoryId;
@@ -3027,7 +2992,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
                         }
                         fileId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", fileId);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, fileId);
                         break;
                     case "SourceDirectory":
                         sourceDirectory = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null);
@@ -3092,17 +3057,15 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new MoveFileTuple(sourceLineNumbers, id)
+                    this.Core.AddTuple(new MoveFileTuple(sourceLineNumbers, id)
                     {
                         ComponentRef = componentId,
                         SourceName  = sourceName,
                         DestName= String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
                         SourceFolder = sourceDirectory ?? sourceProperty,
                         DestFolder = destinationDirectory ?? destinationProperty,
-                        Delete = delete
-                    };
-
-                    this.Core.AddTuple(tuple);
+                        Delete = delete,
+                    });
                 }
             }
             else // copy the file
@@ -3139,15 +3102,13 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new DuplicateFileTuple(sourceLineNumbers, id)
+                    this.Core.AddTuple(new DuplicateFileTuple(sourceLineNumbers, id)
                     {
                         ComponentRef = componentId,
                         FileRef = fileId,
                         DestinationName = String.IsNullOrEmpty(destinationShortName) && String.IsNullOrEmpty(destinationName) ? null : this.GetMsiFilenameValue(destinationShortName, destinationName),
-                        DestinationFolder = destinationDirectory ?? destinationProperty
-                    };
-
-                    this.Core.AddTuple(tuple);
+                        DestinationFolder = destinationDirectory ?? destinationProperty,
+                    });
                 }
             }
         }
@@ -3194,7 +3155,7 @@ namespace WixToolset.Core
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         //sourceBits = MsiInterop.MsidbCustomActionTypeBinaryData;
                         sourceType = CustomActionSourceType.Binary;
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", source); // add a reference to the appropriate Binary
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, source); // add a reference to the appropriate Binary
                         break;
                     case "Directory":
                         if (null != source)
@@ -3229,7 +3190,7 @@ namespace WixToolset.Core
                         // to add a reference. No need to look at the value.
                         if (Int32.TryParse(target, out var ignored))
                         {
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "Error", target);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Error, target);
                         }
                         break;
                     case "ExeCommand":
@@ -3285,7 +3246,7 @@ namespace WixToolset.Core
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         //sourceBits = MsiInterop.MsidbCustomActionTypeSourceFile;
                         sourceType = CustomActionSourceType.File;
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", source); // add a reference to the appropriate File
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, source); // add a reference to the appropriate File
                         break;
                     case "HideTarget":
                         hidden = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -3533,7 +3494,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new CustomActionTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, id)
                 {
                     ExecutionType = executionType,
                     Source = source,
@@ -3547,9 +3508,7 @@ namespace WixToolset.Core
                     TSAware = tsAware,
                     Win64 = win64,
                     Hidden = hidden,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (YesNoType.Yes == suppressModularization)
                 {
@@ -3562,9 +3521,9 @@ namespace WixToolset.Core
         /// Parses a simple reference element.
         /// </summary>
         /// <param name="node">Element to parse.</param>
-        /// <param name="table">Table which contains the target of the simple reference.</param>
+        /// <param name="tupleDefinition">Tuple which contains the target of the simple reference.</param>
         /// <returns>Id of the referenced element.</returns>
-        private string ParseSimpleRefElement(XElement node, string table)
+        private string ParseSimpleRefElement(XElement node, IntermediateTupleDefinition tupleDefinition)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             string id = null;
@@ -3577,7 +3536,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, table, id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, tupleDefinition.Name, id);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -3640,7 +3599,7 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
             }
 
-            this.Core.CreateSimpleReference(sourceLineNumbers, "MsiPatchSequence", primaryKeys);
+            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.MsiPatchSequence, primaryKeys);
 
             this.Core.ParseForExtensionElements(node);
 
@@ -3932,14 +3891,14 @@ namespace WixToolset.Core
                             }
                         }
 
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixCustomTable", tableId);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixCustomTable, tableId);
 
                         if (!this.Core.EncounteredError)
                         {
                             this.Core.AddTuple(new WixCustomRowTuple(childSourceLineNumbers)
                             {
                                 Table = tableId,
-                                FieldData = dataValue
+                                FieldData = dataValue,
                             });
                         }
                         break;
@@ -3963,7 +3922,7 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new WixCustomTableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, tableId))
+                    this.Core.AddTuple(new WixCustomTableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, tableId))
                     {
                         ColumnCount = columnCount,
                         ColumnNames = columnNames,
@@ -3977,10 +3936,8 @@ namespace WixToolset.Core
                         Sets = sets,
                         Descriptions = descriptions,
                         Modularizations = modularizations,
-                        Unreal = bootstrapperApplicationData
-                    };
-
-                    this.Core.AddTuple(tuple);
+                        Unreal = bootstrapperApplicationData,
+                    });
                 }
             }
         }
@@ -4079,7 +4036,7 @@ namespace WixToolset.Core
                     if (inlineSyntax[0].EndsWith(":"))
                     {
                         parentId = inlineSyntax[0].TrimEnd(':');
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Directory", parentId);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, parentId);
 
                         pathStartsAt = 1;
                     }
@@ -4224,7 +4181,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new DirectoryTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new DirectoryTuple(sourceLineNumbers, id)
                 {
                     ParentDirectoryRef = parentId,
                     Name = name,
@@ -4232,9 +4189,7 @@ namespace WixToolset.Core
                     SourceName = sourceName,
                     SourceShortName = shortSourceName,
                     ComponentGuidGenerationSeed = componentGuidGenerationSeed
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (null != symbols)
                 {
@@ -4268,7 +4223,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Directory", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, id);
                         break;
                     case "DiskId":
                         diskId = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue);
@@ -4415,7 +4370,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                         }
                         oneChild = true;
-                        signature = this.ParseSimpleRefElement(child, "Signature");
+                        signature = this.ParseSimpleRefElement(child, TupleDefinitions.Signature);
                         break;
                     default:
                         this.Core.UnexpectedElement(node, child);
@@ -4460,19 +4415,17 @@ namespace WixToolset.Core
                     signature = id.Id;
                 }
 
-                var tuple = new DrLocatorTuple(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path))
+                var tuple = this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path))
                 {
                     SignatureRef = rowId,
                     Parent = parentSignature,
                     Path = path,
-                };
+                });
 
                 if (CompilerConstants.IntegerNotSet != depth)
                 {
                     tuple.Depth = depth;
                 }
-
-                this.Core.AddTuple(tuple);
             }
 
             return signature;
@@ -4575,7 +4528,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                         }
                         oneChild = true;
-                        signature = this.ParseSimpleRefElement(child, "Signature");
+                        signature = this.ParseSimpleRefElement(child, TupleDefinitions.Signature);
                         break;
                     default:
                         this.Core.UnexpectedElement(node, child);
@@ -4589,7 +4542,7 @@ namespace WixToolset.Core
             }
 
 
-            this.Core.CreateSimpleReference(sourceLineNumbers, "DrLocator", id.Id, parentSignature, path);
+            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.DrLocator, id.Id, parentSignature, path);
 
             return signature;
         }
@@ -4829,7 +4782,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new FeatureTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new FeatureTuple(sourceLineNumbers, id)
                 {
                     ParentFeatureRef = null, // this field is set in the linker
                     Title = title,
@@ -4841,9 +4794,7 @@ namespace WixToolset.Core
                     DisallowAdvertise = disallowAdvertise,
                     InstallDefault = installDefault,
                     TypicalDefault = typicalDefault,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (ComplexReferenceParentType.Unknown != parentType)
                 {
@@ -4873,7 +4824,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Feature", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, id);
                         break;
                     case "IgnoreParent":
                         ignoreParent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -5053,7 +5004,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixFeatureGroup", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixFeatureGroup, id);
                         break;
                     case "IgnoreParent":
                         ignoreParent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -5222,7 +5173,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new EnvironmentTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new EnvironmentTuple(sourceLineNumbers, id)
                 {
                     Name = name,
                     Value = value,
@@ -5232,14 +5183,7 @@ namespace WixToolset.Core
                     Permanent = permanent,
                     System = system,
                     ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
-
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Environment, id);
-                //row.Set(1, String.Concat(action, uninstall, system ? "*" : String.Empty, name));
-                //row.Set(2, text);
-                //row.Set(3, componentId);
+                });
             }
         }
 
@@ -5282,12 +5226,10 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
+                this.Core.AddTuple(new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
                 {
                     Message = Common.GetInnerText(node)
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -5373,18 +5315,16 @@ namespace WixToolset.Core
             {
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId))
+                    this.Core.AddTuple(new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId))
                     {
                         Extension = extension,
                         ComponentRef = componentId,
                         ProgIdRef = progId,
                         MimeRef = mime,
-                        FeatureRef = Guid.Empty.ToString("B")
-                    };
-
-                    this.Core.AddTuple(tuple);
+                        FeatureRef = Guid.Empty.ToString("B"),
+                    });
 
-                    this.Core.EnsureTable(sourceLineNumbers, "Verb");
+                    this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Verb);
                 }
             }
             else if (YesNoType.No == advertise)
@@ -5481,11 +5421,11 @@ namespace WixToolset.Core
                         break;
                     case "AssemblyApplication":
                         assemblyApplication = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", assemblyApplication);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, assemblyApplication);
                         break;
                     case "AssemblyManifest":
                         assemblyManifest = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", assemblyManifest);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, assemblyManifest);
                         break;
                     case "BindPath":
                         bindPath = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty);
@@ -5499,7 +5439,7 @@ namespace WixToolset.Core
                         break;
                     case "CompanionFile":
                         companionFile = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", companionFile);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, companionFile);
                         break;
                     case "Compressed":
                         var compressedValue = this.Core.GetAttributeYesNoDefaultValue(sourceLineNumbers, attrib);
@@ -5797,7 +5737,7 @@ namespace WixToolset.Core
                 attributes |= compressed.HasValue && compressed == false ? FileTupleAttributes.Uncompressed : 0;
                 attributes |= generatedShortFileName ? FileTupleAttributes.GeneratedShortFileName : 0;
 
-                var tuple = new FileTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new FileTuple(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     Name = name,
@@ -5831,10 +5771,8 @@ namespace WixToolset.Core
                     IgnoreOffsets = ignoreOffsets,
                     IgnoreLengths = ignoreLengths,
                     RetainOffsets = protectOffsets,
-                    SymbolPaths = symbols
-                };
-
-                this.Core.AddTuple(tuple);
+                    SymbolPaths = symbols,
+                });
 
                 if (AssemblyType.NotAnAssembly != assemblyType)
                 {
@@ -5850,7 +5788,7 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.CreateSimpleReference(sourceLineNumbers, "Media", diskId.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat));
 
             // If this component does not have a companion file this file is a possible keypath.
             possibleKeyPath = null;
@@ -5990,13 +5928,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new SignatureTuple(sourceLineNumbers, id)
+                var tuple = this.Core.AddTuple(new SignatureTuple(sourceLineNumbers, id)
                 {
                     FileName = name ?? shortName,
                     MinVersion = minVersion,
                     MaxVersion = maxVersion,
                     Languages = languages
-                };
+                });
 
                 if (CompilerConstants.IntegerNotSet != minSize)
                 {
@@ -6018,8 +5956,6 @@ namespace WixToolset.Core
                     tuple.MaxDate = maxDate;
                 }
 
-                this.Core.AddTuple(tuple);
-
                 // Create a DrLocator row to associate the file with a directory
                 // when a different identifier is specified for the FileSearch.
                 if (!isSameId)
@@ -6125,7 +6061,7 @@ namespace WixToolset.Core
                         this.ParseBundleExtensionElement(child);
                         break;
                     case "BundleExtensionRef":
-                        this.ParseSimpleRefElement(child, "WixBundleExtension");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleExtension);
                         break;
                     case "ComplianceCheck":
                         this.ParseComplianceCheckElement(child);
@@ -6146,7 +6082,7 @@ namespace WixToolset.Core
                         this.ParseCustomActionElement(child);
                         break;
                     case "CustomActionRef":
-                        this.ParseSimpleRefElement(child, "CustomAction");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction);
                         break;
                     case "CustomTable":
                         this.ParseCustomTableElement(child);
@@ -6161,7 +6097,7 @@ namespace WixToolset.Core
                         this.ParseEmbeddedChainerElement(child);
                         break;
                     case "EmbeddedChainerRef":
-                        this.ParseSimpleRefElement(child, "MsiEmbeddedChainer");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer);
                         break;
                     case "EnsureTable":
                         this.ParseEnsureTableElement(child);
@@ -6210,7 +6146,7 @@ namespace WixToolset.Core
                         this.ParsePropertyElement(child);
                         break;
                     case "PropertyRef":
-                        this.ParseSimpleRefElement(child, "Property");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.Property);
                         break;
                     case "RelatedBundle":
                         this.ParseRelatedBundleElement(child);
@@ -6225,7 +6161,7 @@ namespace WixToolset.Core
                         this.ParseSetVariableElement(child);
                         break;
                     case "SetVariableRef":
-                        this.ParseSimpleRefElement(child, "WixSetVariable");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixSetVariable);
                         break;
                     case "SFPCatalog":
                         string parentName = null;
@@ -6235,7 +6171,7 @@ namespace WixToolset.Core
                         this.ParseUIElement(child);
                         break;
                     case "UIRef":
-                        this.ParseSimpleRefElement(child, "WixUI");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixUI);
                         break;
                     case "Upgrade":
                         this.ParseUpgradeElement(child);
@@ -6555,7 +6491,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new IniFileTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new IniFileTuple(sourceLineNumbers, id)
                 {
                     FileName = this.GetMsiFilenameValue(shortName, name),
                     DirProperty = directory,
@@ -6564,9 +6500,7 @@ namespace WixToolset.Core
                     Value = value,
                     Action = action.Value,
                     ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -6724,7 +6658,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                         }
                         oneChild = true;
-                        var newId = this.ParseSimpleRefElement(child, "Signature"); // FileSearch signatures override parent signatures
+                        var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures
                         id = new Identifier(AccessModifier.Private, newId);
                         signature = null;
                         break;
@@ -6741,21 +6675,19 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new IniLocatorTuple(sourceLineNumbers, id)
+                var tuple = this.Core.AddTuple(new IniLocatorTuple(sourceLineNumbers, id)
                 {
                     SignatureRef = id.Id,
                     FileName = this.GetMsiFilenameValue(shortName, name),
                     Section = section,
                     Key = key,
                     Type = type
-                };
+                });
 
                 if (CompilerConstants.IntegerNotSet != field)
                 {
                     tuple.Field = field;
                 }
-
-                this.Core.AddTuple(tuple);
             }
 
             return signature;
@@ -6779,7 +6711,7 @@ namespace WixToolset.Core
                     {
                     case "Shared":
                         shared = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Component", shared);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Component, shared);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -6841,9 +6773,22 @@ namespace WixToolset.Core
 
                         if (!this.Core.EncounteredError)
                         {
-                            var tuple = this.Core.CreateTuple(sourceLineNumbers, "PatchCertificates" == node.Name.LocalName ? TupleDefinitionType.MsiPatchCertificate : TupleDefinitionType.MsiPackageCertificate);
-                            tuple.Set(0, name);
-                            tuple.Set(1, name);
+                            if ("PatchCertificates" == node.Name.LocalName)
+                            {
+                                this.Core.AddTuple(new MsiPatchCertificateTuple(sourceLineNumbers)
+                                {
+                                    PatchCertificate = name,
+                                    DigitalCertificateRef = name,
+                                });
+                            }
+                            else
+                            {
+                                this.Core.AddTuple(new MsiPackageCertificateTuple(sourceLineNumbers)
+                                {
+                                    PackageCertificate = name,
+                                    DigitalCertificateRef = name,
+                                });
+                            }
                         }
                         break;
                     default:
@@ -7109,14 +7054,14 @@ namespace WixToolset.Core
             if (!this.Core.EncounteredError)
             {
                 // create the row that performs the upgrade (or downgrade)
-                var tuple = new UpgradeTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers)
                 {
                     UpgradeCode = upgradeCode,
                     Remove = removeFeatures,
                     MigrateFeatures = migrateFeatures,
                     IgnoreRemoveFailures = ignoreRemoveFailure,
                     ActionProperty = Common.UpgradeDetectedProperty
-                };
+                });
 
                 if (allowDowngrades)
                 {
@@ -7131,24 +7076,20 @@ namespace WixToolset.Core
                     tuple.VersionMaxInclusive = allowSameVersionUpgrades;
                 }
 
-                this.Core.AddTuple(tuple);
-
                 // Add launch condition that blocks upgrades
                 if (blockUpgrades)
                 {
-                    var conditionTuple = new LaunchConditionTuple(sourceLineNumbers)
+                    this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers)
                     {
                         Condition = Common.UpgradePreventedCondition,
                         Description = downgradeErrorMessage
-                    };
-
-                    this.Core.AddTuple(conditionTuple);
+                    });
                 }
 
                 // now create the Upgrade row and launch conditions to prevent downgrades (unless explicitly permitted)
                 if (!allowDowngrades)
                 {
-                    var upgradeTuple = new UpgradeTuple(sourceLineNumbers)
+                    this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers)
                     {
                         UpgradeCode = upgradeCode,
                         VersionMin = productVersion,
@@ -7156,17 +7097,13 @@ namespace WixToolset.Core
                         OnlyDetect = true,
                         IgnoreRemoveFailures = ignoreRemoveFailure,
                         ActionProperty = Common.DowngradeDetectedProperty
-                    };
-
-                    this.Core.AddTuple(upgradeTuple);
+                    });
 
-                    var conditionTuple = new LaunchConditionTuple(sourceLineNumbers)
+                    this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers)
                     {
                         Condition = Common.DowngradePreventedCondition,
                         Description = downgradeErrorMessage
-                    };
-
-                    this.Core.AddTuple(conditionTuple);
+                    });
                 }
 
                 // finally, schedule RemoveExistingProducts
@@ -7232,7 +7169,7 @@ namespace WixToolset.Core
                         break;
                     case "DiskPrompt":
                         diskPrompt = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Property", "DiskPrompt"); // ensure the output has a DiskPrompt Property defined
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined
                         break;
                     case "EmbedCab":
                         embedCab = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -7364,7 +7301,7 @@ namespace WixToolset.Core
             // add the row to the section
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MediaTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
+                this.Core.AddTuple(new MediaTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
                 {
                     DiskId = id,
                     DiskPrompt = diskPrompt,
@@ -7373,9 +7310,7 @@ namespace WixToolset.Core
                     Source = source, // the Source column is only set when creating a patch
                     CompressionLevel = compressionLevel,
                     Layout = layout
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (null != symbols)
                 {
@@ -7441,7 +7376,7 @@ namespace WixToolset.Core
                         break;
                     case "DiskPrompt":
                         diskPrompt = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Property", "DiskPrompt"); // ensure the output has a DiskPrompt Property defined
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined
                         this.Core.Write(WarningMessages.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
                         break;
                     case "EmbedCab":
@@ -7480,7 +7415,7 @@ namespace WixToolset.Core
                     DiskId = 1
                 });
 
-                var tuple = new WixMediaTemplateTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixMediaTemplateTuple(sourceLineNumbers)
                 {
                     CabinetTemplate = cabinetTemplate,
                     VolumeLabel = volumeLabel,
@@ -7488,7 +7423,7 @@ namespace WixToolset.Core
                     MaximumUncompressedMediaSize = maximumUncompressedMediaSize,
                     MaximumCabinetSizeForLargeFileSplitting = maximumCabinetSizeForLargeFileSplitting,
                     CompressionLevel = compressionLevel
-                };
+                });
 
                 //else
                 //{
@@ -7499,8 +7434,6 @@ namespace WixToolset.Core
                 //{
                 //    mediaTemplateRow.MaximumCabinetSizeForLargeFileSplitting = 0; // Default value of 0 corresponds to max size of 2048 MB (i.e. 2 GB)
                 //}
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -7530,7 +7463,7 @@ namespace WixToolset.Core
                         break;
                     case "DiskId":
                         diskId = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Media", diskId.ToString(CultureInfo.InvariantCulture.NumberFormat));
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat));
                         break;
                     case "FileCompression":
                         var compress = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -7604,7 +7537,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixMergeTuple(sourceLineNumbers, id)
+                var tuple = this.Core.AddTuple(new WixMergeTuple(sourceLineNumbers, id)
                 {
                     DirectoryRef = directoryId,
                     SourceFile = sourceFile,
@@ -7612,11 +7545,9 @@ namespace WixToolset.Core
                     ConfigurationData = configData,
                     FileAttributes = attributes,
                     FeatureRef = Guid.Empty.ToString("B")
-                };
+                });
 
                 tuple.Set((int)WixMergeTupleFields.Language, language);
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -7701,7 +7632,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixMerge", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixMerge, id);
                         break;
                     case "Primary":
                         primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -7794,14 +7725,12 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType))
+                    this.Core.AddTuple(new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType))
                     {
                         ContentType = contentType,
                         ExtensionRef = extension,
                         CLSID = classId
-                    };
-
-                    this.Core.AddTuple(tuple);
+                    });
                 }
             }
             else if (YesNoType.No == advertise)
@@ -7902,12 +7831,10 @@ namespace WixToolset.Core
         {
             if (!this.Core.EncounteredError)
             {
-                var tuple = new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name))
+                this.Core.AddTuple(new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name))
                 {
                     Value = value
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -8063,13 +7990,11 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixPatchRefTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixPatchRefTuple(sourceLineNumbers)
                 {
                     Table = "*",
-                    PrimaryKeys = "*"
-                };
-
-                this.Core.AddTuple(tuple);
+                    PrimaryKeys = "*",
+                });
             }
         }
 
@@ -8112,13 +8037,11 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixPatchRefTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixPatchRefTuple(sourceLineNumbers)
                 {
                     Table = tableName,
                     PrimaryKeys = id
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -8232,16 +8155,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixPatchBaselineTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new WixPatchBaselineTuple(sourceLineNumbers, id)
                 {
                     DiskId = diskId ?? 1,
                     ValidationFlags = validationFlags,
                     BaselineFile = new IntermediateFieldPathValue { Path = baselineFile },
                     UpdateFile = new IntermediateFieldPathValue { Path = updateFile },
-                    TransformFile = new IntermediateFieldPathValue { Path = transformFile }
-                };
-
-                this.Core.AddTuple(tuple);
+                    TransformFile = new IntermediateFieldPathValue { Path = transformFile },
+                });
             }
         }
 
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index 51828975..93f9276c 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Core
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -166,9 +167,10 @@ namespace WixToolset.Core
         /// Add a tuple to the active section.
         /// </summary>
         /// <param name="tuple">Tuple to add.</param>
-        public void AddTuple(IntermediateTuple tuple)
+        public T AddTuple<T>(T tuple)
+            where T : IntermediateTuple
         {
-            this.ActiveSection.Tuples.Add(tuple);
+            return this.ActiveSection.AddTuple(tuple);
         }
 
         /// <summary>
@@ -351,23 +353,6 @@ namespace WixToolset.Core
         }
 
         /// <summary>
-        /// Creates a tuple in the active section.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Source and line number of current row.</param>
-        /// <param name="tupleType">Type of tuple to create.</param>
-        /// <param name="identifier">Optional identifier.</param>
-        /// <returns>New tuple.</returns>
-        public IntermediateTuple CreateTuple(SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null)
-        {
-            var tupleDefinition = TupleDefinitions.ByType(tupleType);
-            var tuple = tupleDefinition.CreateTuple(sourceLineNumbers, identifier);
-
-            this.ActiveSection.Tuples.Add(tuple);
-
-            return tuple;
-        }
-
-        /// <summary>
         /// Creates directories using the inline directory syntax.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information.</param>
@@ -394,27 +379,38 @@ namespace WixToolset.Core
         }
 
         /// <summary>
-        /// Create a WixSimpleReference row in the active section.
+        /// Create a WixSimpleReferenceTuple in the active section.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
-        /// <param name="tableName">The table name of the simple reference.</param>
+        /// <param name="tupleName">The tuple name of the simple reference.</param>
         /// <param name="primaryKeys">The primary keys of the simple reference.</param>
-        public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string tableName, params string[] primaryKeys)
+        public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys)
         {
             if (!this.EncounteredError)
             {
-                string joinedKeys = String.Join("/", primaryKeys);
-                string id = String.Concat(tableName, ":", joinedKeys);
+                var joinedKeys = String.Join("/", primaryKeys);
+                var id = String.Concat(tupleName, ":", joinedKeys);
 
                 // If this simple reference hasn't been added to the active section already, add it.
                 if (this.activeSectionSimpleReferences.Add(id))
                 {
-                    this.parseHelper.CreateSimpleReference(this.ActiveSection, sourceLineNumbers, tableName, primaryKeys);
+                    this.parseHelper.CreateSimpleReference(this.ActiveSection, sourceLineNumbers, tupleName, primaryKeys);
                 }
             }
         }
 
         /// <summary>
+        /// Create a WixSimpleReferenceTuple in the active section.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line information for the row.</param>
+        /// <param name="tupleDefinition">The tuple definition of the simple reference.</param>
+        /// <param name="primaryKeys">The primary keys of the simple reference.</param>
+        public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys)
+        {
+            this.CreateSimpleReference(sourceLineNumbers, tupleDefinition.Name, primaryKeys);
+        }
+
+        /// <summary>
         /// A row in the WixGroup table is added for this child node and its parent node.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
@@ -431,7 +427,7 @@ namespace WixToolset.Core
         }
 
         /// <summary>
-        /// Add the appropriate rows to make sure that the given table shows up
+        /// Add the appropriate tuples to make sure that the given table shows up
         /// in the resulting output.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line numbers.</param>
@@ -445,6 +441,20 @@ namespace WixToolset.Core
         }
 
         /// <summary>
+        /// Add the appropriate tuples to make sure that the given table shows up
+        /// in the resulting output.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line numbers.</param>
+        /// <param name="tableDefinition">Definition of the table to ensure existance of.</param>
+        public void EnsureTable(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
+        {
+            if (!this.EncounteredError)
+            {
+                this.parseHelper.EnsureTable(this.ActiveSection, sourceLineNumbers, tableDefinition);
+            }
+        }
+
+        /// <summary>
         /// Get an attribute value.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 89d4b6da..d7cb36bc 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -193,7 +193,7 @@ namespace WixToolset.Core
                             this.ParseCustomActionElement(child);
                             break;
                         case "CustomActionRef":
-                            this.ParseSimpleRefElement(child, "CustomAction");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction);
                             break;
                         case "CustomTable":
                             this.ParseCustomTableElement(child);
@@ -208,7 +208,7 @@ namespace WixToolset.Core
                             this.ParseEmbeddedChainerElement(child);
                             break;
                         case "EmbeddedChainerRef":
-                            this.ParseSimpleRefElement(child, "MsiEmbeddedChainer");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer);
                             break;
                         case "EnsureTable":
                             this.ParseEnsureTableElement(child);
@@ -248,7 +248,7 @@ namespace WixToolset.Core
                             this.ParsePropertyElement(child);
                             break;
                         case "PropertyRef":
-                            this.ParseSimpleRefElement(child, "Property");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.Property);
                             break;
                         case "SetDirectory":
                             this.ParseSetDirectoryElement(child);
@@ -274,7 +274,7 @@ namespace WixToolset.Core
                             this.ParseUIElement(child);
                             break;
                         case "UIRef":
-                            this.ParseSimpleRefElement(child, "WixUI");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.WixUI);
                             break;
                         case "Upgrade":
                             this.ParseUpgradeElement(child);
@@ -297,14 +297,12 @@ namespace WixToolset.Core
                 {
                     if (null != symbols)
                     {
-                        var tuple = new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers)
+                        this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers)
                         {
                             SymbolId = productCode,
                             SymbolType = SymbolPathType.Product,
-                            SymbolPaths = symbols
-                        };
-
-                        this.Core.AddTuple(tuple);
+                            SymbolPaths = symbols,
+                        });
                     }
                 }
             }
@@ -340,14 +338,14 @@ namespace WixToolset.Core
                         break;
                     case "File":
                         driver = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", driver);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, driver);
                         break;
                     case "Name":
                         name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         break;
                     case "SetupFile":
                         setup = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", setup);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, setup);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -405,11 +403,29 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = this.Core.CreateTuple(sourceLineNumbers, tupleDefinitionType, id);
-                tuple.Set(1, componentId);
-                tuple.Set(2, name);
-                tuple.Set(3, driver);
-                tuple.Set(4, setup);
+                switch (tupleDefinitionType)
+                {
+                    case TupleDefinitionType.ODBCDriver:
+                        this.Core.AddTuple(new ODBCDriverTuple(sourceLineNumbers, id)
+                        {
+                            ComponentRef = componentId,
+                            Description = name,
+                            FileRef = driver,
+                            SetupFileRef = setup,
+                        });
+                        break;
+                    case TupleDefinitionType.ODBCTranslator:
+                        this.Core.AddTuple(new ODBCTranslatorTuple(sourceLineNumbers, id)
+                        {
+                            ComponentRef = componentId,
+                            Description = name,
+                            FileRef = driver,
+                            SetupFileRef = setup,
+                        });
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType));
+                }
             }
         }
 
@@ -457,10 +473,28 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = this.Core.CreateTuple(sourceLineNumbers, tupleDefinitionType, new Identifier(AccessModifier.Private, parentId, id));
-                tuple.Set(0, parentId);
-                tuple.Set(1, id);
-                tuple.Set(2, propertyValue);
+                var identifier = new Identifier(AccessModifier.Private, parentId, id);
+                switch (tupleDefinitionType)
+                {
+                    case TupleDefinitionType.ODBCAttribute:
+                        this.Core.AddTuple(new ODBCAttributeTuple(sourceLineNumbers, identifier)
+                        {
+                            DriverRef = parentId,
+                            Attribute = id,
+                            Value = propertyValue,
+                        });
+                        break;
+                    case TupleDefinitionType.ODBCSourceAttribute:
+                        this.Core.AddTuple(new ODBCSourceAttributeTuple(sourceLineNumbers, identifier)
+                        {
+                            DataSourceRef = parentId,
+                            Attribute = id,
+                            Value = propertyValue,
+                        });
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType));
+                }
             }
         }
 
@@ -674,13 +708,11 @@ namespace WixToolset.Core
                         switch (installScope)
                         {
                         case "perMachine":
-                            {
                             this.Core.AddTuple(new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS"))
                             {
                                 Value = "1"
                             });
                             installScopeSeen = true;
-                            }
                             break;
                         case "perUser":
                             sourceBits |= 8;
@@ -1353,18 +1385,18 @@ namespace WixToolset.Core
             {
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))
+                    var tuple = this.Core.AddTuple(new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId))
                     {
                         ProgId = progId,
                         ParentProgIdRef = parent,
                         ClassRef = classId,
                         Description = description,
-                    };
+                    });
 
                     if (null != icon)
                     {
                         tuple.IconRef = icon;
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon);
                     }
 
                     if (CompilerConstants.IntegerNotSet != iconIndex)
@@ -1372,9 +1404,7 @@ namespace WixToolset.Core
                         tuple.IconIndex = iconIndex;
                     }
 
-                    this.Core.AddTuple(tuple);
-
-                    this.Core.EnsureTable(sourceLineNumbers, "Class");
+                    this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Class);
                 }
             }
             else if (YesNoType.No == advertise)
@@ -1403,7 +1433,7 @@ namespace WixToolset.Core
 
                 if (null != icon)   // ProgId's Default Icon
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "File", icon);
+                    this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, icon);
 
                     icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon);
 
@@ -1513,7 +1543,7 @@ namespace WixToolset.Core
 
             if ("ErrorDialog" == id.Id)
             {
-                this.Core.CreateSimpleReference(sourceLineNumbers, "Dialog", value);
+                this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, value);
             }
 
             foreach (var child in node.Elements())
@@ -1764,15 +1794,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError && null != name)
             {
-                var tuple = new RegistryTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id)
                 {
                     Root = root.Value,
                     Key = key,
                     Name = name,
                     ComponentRef = componentId,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
 
             return keyPath;
@@ -2011,7 +2039,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RegistryTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id)
                 {
                     Root = root.Value,
                     Key = key,
@@ -2020,15 +2048,7 @@ namespace WixToolset.Core
                     ValueType = valueType,
                     ValueAction = actionType,
                     ComponentRef = componentId,
-                };
-
-                this.Core.AddTuple(tuple);
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Registry, id);
-                //row.Set(1, (int)root);
-                //row.Set(2, key);
-                //row.Set(3, name);
-                //row.Set(4, value);
-                //row.Set(5, componentId);
+                });
             }
 
             // If this was just a regular registry key (that could be the key path)
@@ -2134,16 +2154,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RemoveRegistryTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id)
                 {
                     Root = root.Value,
                     Key = key,
                     Name = name,
                     Action = actionType.Value,
-                    ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
+                    ComponentRef = componentId,
+                });
             }
         }
 
@@ -2212,15 +2230,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RemoveRegistryTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id)
                 {
                     Root = root.Value,
                     Key = key,
                     Name = name,
                     ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -2333,16 +2349,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RemoveFileTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     FileName = this.GetMsiFilenameValue(shortName, name),
                     DirProperty = directory ?? property ?? parentDirectory,
                     OnInstall = onInstall,
-                    OnUninstall = onUninstall
-                };
-
-                this.Core.AddTuple(tuple);
+                    OnUninstall = onUninstall,
+                });
             }
         }
 
@@ -2423,15 +2437,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RemoveFileTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     DirProperty = directory ?? property ?? parentDirectory,
                     OnInstall = onInstall,
                     OnUninstall = onUninstall
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -2540,7 +2552,7 @@ namespace WixToolset.Core
                             if (customAction)
                             {
                                 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
-                                this.Core.CreateSimpleReference(childSourceLineNumbers, "CustomAction", actionName);
+                                this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.CustomAction, actionName);
                             }
                             else
                             {
@@ -2551,7 +2563,7 @@ namespace WixToolset.Core
                             if (customAction || showDialog || specialAction || specialStandardAction)
                             {
                                 afterAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
-                                this.Core.CreateSimpleReference(childSourceLineNumbers, "WixAction", sequenceTable.ToString(), afterAction);
+                                this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), afterAction);
                             }
                             else
                             {
@@ -2562,7 +2574,7 @@ namespace WixToolset.Core
                             if (customAction || showDialog || specialAction || specialStandardAction)
                             {
                                 beforeAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
-                                this.Core.CreateSimpleReference(childSourceLineNumbers, "WixAction", sequenceTable.ToString(), beforeAction);
+                                this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), beforeAction);
                             }
                             else
                             {
@@ -2573,7 +2585,7 @@ namespace WixToolset.Core
                             if (showDialog)
                             {
                                 actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib);
-                                this.Core.CreateSimpleReference(childSourceLineNumbers, "Dialog", actionName);
+                                this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.Dialog, actionName);
                             }
                             else
                             {
@@ -2699,7 +2711,7 @@ namespace WixToolset.Core
                     }
                     else
                     {
-                        var tuple = new WixActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName))
+                        var tuple = this.Core.AddTuple(new WixActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName))
                         {
                             SequenceTable = sequenceTable,
                             Action = actionName,
@@ -2707,14 +2719,12 @@ namespace WixToolset.Core
                             Before = beforeAction,
                             After = afterAction,
                             Overridable = overridable,
-                        };
+                        });
 
                         if (CompilerConstants.IntegerNotSet != sequence)
                         {
                             tuple.Sequence = sequence;
                         }
-
-                        this.Core.AddTuple(tuple);
                     }
                 }
             }
@@ -3008,7 +3018,7 @@ namespace WixToolset.Core
             {
                 if (!String.IsNullOrEmpty(delayedAutoStart))
                 {
-                    var tuple = new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS")))
+                    this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS")))
                     {
                         Name = name,
                         OnInstall = install,
@@ -3017,20 +3027,12 @@ namespace WixToolset.Core
                         ConfigType = MsiServiceConfigType.DelayedAutoStart,
                         Argument = delayedAutoStart,
                         ComponentRef = componentId,
-                    };
-
-                    this.Core.AddTuple(tuple);
-                    //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiServiceConfig, new Identifier(String.Concat(id.Id, ".DS"), id.Access));
-                    //row.Set(1, name);
-                    //row.Set(2, events);
-                    //row.Set(3, 3);
-                    //row.Set(4, delayedAutoStart);
-                    //row.Set(5, componentId);
+                    });
                 }
 
                 if (!String.IsNullOrEmpty(failureActionsWhen))
                 {
-                    var tuple = new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA")))
+                    this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA")))
                     {
                         Name = name,
                         OnInstall = install,
@@ -3039,20 +3041,12 @@ namespace WixToolset.Core
                         ConfigType = MsiServiceConfigType.FailureActionsFlag,
                         Argument = failureActionsWhen,
                         ComponentRef = componentId,
-                    };
-
-                    this.Core.AddTuple(tuple);
-                    //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiServiceConfig, new Identifier(String.Concat(id.Id, ".FA"), id.Access));
-                    //row.Set(1, name);
-                    //row.Set(2, events);
-                    //row.Set(3, 4);
-                    //row.Set(4, failureActionsWhen);
-                    //row.Set(5, componentId);
+                    });
                 }
 
                 if (!String.IsNullOrEmpty(sid))
                 {
-                    var tuple = new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS")))
+                    this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS")))
                     {
                         Name = name,
                         OnInstall = install,
@@ -3061,20 +3055,12 @@ namespace WixToolset.Core
                         ConfigType = MsiServiceConfigType.ServiceSidInfo,
                         Argument = sid,
                         ComponentRef = componentId,
-                    };
-
-                    this.Core.AddTuple(tuple);
-                    //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiServiceConfig, new Identifier(String.Concat(id.Id, ".SS"), id.Access));
-                    //row.Set(1, name);
-                    //row.Set(2, events);
-                    //row.Set(3, 5);
-                    //row.Set(4, sid);
-                    //row.Set(5, componentId);
+                    });
                 }
 
                 if (!String.IsNullOrEmpty(requiredPrivileges))
                 {
-                    var tuple = new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP")))
+                    this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP")))
                     {
                         Name = name,
                         OnInstall = install,
@@ -3083,20 +3069,12 @@ namespace WixToolset.Core
                         ConfigType = MsiServiceConfigType.RequiredPrivilegesInfo,
                         Argument = requiredPrivileges,
                         ComponentRef = componentId,
-                    };
-
-                    this.Core.AddTuple(tuple);
-                    //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiServiceConfig, new Identifier(String.Concat(id.Id, ".RP"), id.Access));
-                    //row.Set(1, name);
-                    //row.Set(2, events);
-                    //row.Set(3, 6);
-                    //row.Set(4, requiredPrivileges);
-                    //row.Set(5, componentId);
+                    });
                 }
 
                 if (!String.IsNullOrEmpty(preShutdownDelay))
                 {
-                    var tuple = new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD")))
+                    this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD")))
                     {
                         Name = name,
                         OnInstall = install,
@@ -3105,15 +3083,7 @@ namespace WixToolset.Core
                         ConfigType = MsiServiceConfigType.PreshutdownInfo,
                         Argument = preShutdownDelay,
                         ComponentRef = componentId,
-                    };
-
-                    this.Core.AddTuple(tuple);
-                    //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiServiceConfig, new Identifier(String.Concat(id.Id, ".PD"), id.Access));
-                    //row.Set(1, name);
-                    //row.Set(2, events);
-                    //row.Set(3, 7);
-                    //row.Set(4, preShutdownDelay);
-                    //row.Set(5, componentId);
+                    });
                 }
             }
         }
@@ -3284,7 +3254,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MsiServiceConfigFailureActionsTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new MsiServiceConfigFailureActionsTuple(sourceLineNumbers, id)
                 {
                     Name = name,
                     OnInstall = install, 
@@ -3296,9 +3266,7 @@ namespace WixToolset.Core
                     Actions = actions,
                     DelayActions = actionsDelays,
                     ComponentRef = componentId,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -3438,7 +3406,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ServiceControlTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new ServiceControlTuple(sourceLineNumbers, id)
                 {
                     Name = name,
                     InstallRemove = installRemove,
@@ -3450,9 +3418,7 @@ namespace WixToolset.Core
                     Arguments = arguments,
                     Wait = wait,
                     ComponentRef = componentId
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -3697,7 +3663,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ServiceInstallTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new ServiceInstallTuple(sourceLineNumbers, id)
                 {
                     Name = name,
                     DisplayName = displayName,
@@ -3713,23 +3679,7 @@ namespace WixToolset.Core
                     Description  = description,
                     Interactive = interactive,
                     Vital = vital
-                };
-
-                this.Core.AddTuple(tuple);
-
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.ServiceInstall, id);
-                //row.Set(1, name);
-                //row.Set(2, displayName);
-                //row.Set(3, typebits);
-                //row.Set(4, startType);
-                //row.Set(5, errorbits);
-                //row.Set(6, loadOrderGroup);
-                //row.Set(7, dependencies);
-                //row.Set(8, account);
-                //row.Set(9, password);
-                //row.Set(10, arguments);
-                //row.Set(11, componentId);
-                //row.Set(12, description);
+                });
             }
         }
 
@@ -3758,7 +3708,7 @@ namespace WixToolset.Core
                         break;
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Directory", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, id);
                         break;
                     case "Sequence":
                         var sequenceValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -3816,16 +3766,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
+                this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
                 {
                     ExecutionType = executionType,
                     SourceType = CustomActionSourceType.Directory,
                     TargetType = CustomActionTargetType.TextData,
                     Source = id,
                     Target = value
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 foreach (var sequence in sequences)
                 {
@@ -3966,16 +3914,14 @@ namespace WixToolset.Core
                     this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction));
                 }
 
-                var tuple = new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
+                this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName))
                 {
                     ExecutionType = executionType,
                     SourceType = CustomActionSourceType.Property,
                     TargetType = CustomActionTargetType.TextData,
                     Source = id,
-                    Target = value
-                };
-
-                this.Core.AddTuple(tuple);
+                    Target = value,
+                });
 
                 foreach (var sequence in sequences)
                 {
@@ -4192,7 +4138,7 @@ namespace WixToolset.Core
                         break;
                     case "Icon":
                         icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Icon", icon);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon);
                         break;
                     case "IconIndex":
                         iconIndex = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int16.MinValue + 1, Int16.MaxValue);
@@ -4390,7 +4336,7 @@ namespace WixToolset.Core
                     target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget);
                 }
 
-                var tuple = new ShortcutTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new ShortcutTuple(sourceLineNumbers, id)
                 {
                     DirectoryRef = directory,
                     Name = name,
@@ -4408,9 +4354,7 @@ namespace WixToolset.Core
                     DisplayResourceId = displayResourceId,
                     DescriptionResourceDll = descriptionResourceDll,
                     DescriptionResourceId = descriptionResourceId,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -4679,7 +4623,7 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new TypeLibTuple(sourceLineNumbers)
+                    var tuple = this.Core.AddTuple(new TypeLibTuple(sourceLineNumbers)
                     {
                         LibId = id,
                         Language = language,
@@ -4687,7 +4631,7 @@ namespace WixToolset.Core
                         Description = description,
                         DirectoryRef = helpDirectory,
                         FeatureRef = Guid.Empty.ToString("B")
-                    };
+                    });
 
                     if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion)
                     {
@@ -4698,8 +4642,6 @@ namespace WixToolset.Core
                     {
                         tuple.Cost = cost;
                     }
-
-                    this.Core.AddTuple(tuple);
                 }
             }
             else if (YesNoType.No == advertise)
@@ -4894,7 +4836,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new UpgradeTuple(sourceLineNumbers)
+                this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers)
                 {
                     UpgradeCode = upgradeId,
                     VersionMin = minimum,
@@ -4908,15 +4850,13 @@ namespace WixToolset.Core
                     OnlyDetect = onlyDetect,
                     Remove = removeFeatures,
                     ActionProperty = actionProperty
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 // Ensure that RemoveExistingProducts is authored in InstallExecuteSequence
                 // if at least one row in Upgrade table lacks the OnlyDetect attribute.
                 if (!onlyDetect)
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", "InstallExecuteSequence", "RemoveExistingProducts");
+                    this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixAction, "InstallExecuteSequence", "RemoveExistingProducts");
                 }
             }
         }
@@ -4964,7 +4904,7 @@ namespace WixToolset.Core
                         break;
                     case "TargetFile":
                         targetFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", targetFile);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, targetFile);
                         break;
                     case "TargetProperty":
                         targetProperty = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -5021,20 +4961,18 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new VerbTuple(sourceLineNumbers)
+                    var tuple = this.Core.AddTuple(new VerbTuple(sourceLineNumbers)
                     {
                         ExtensionRef = extension,
                         Verb = id,
                         Command = command,
                         Argument = argument,
-                    };
+                    });
 
                     if (CompilerConstants.IntegerNotSet != sequence)
                     {
                         tuple.Sequence = sequence;
                     }
-
-                    this.Core.AddTuple(tuple);
                 }
             }
             else if (YesNoType.No == advertise)
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index ff746f8d..a0fe1608 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -84,14 +84,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixApprovedExeForElevationTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new WixApprovedExeForElevationTuple(sourceLineNumbers, id)
                 {
                     Key = key,
                     ValueName = valueName,
-                    Attributes = attributes
-                };
-
-                this.Core.AddTuple(tuple);
+                    Attributes = attributes,
+                });
             }
         }
 
@@ -282,7 +280,7 @@ namespace WixToolset.Core
                         this.ParseBundleExtensionElement(child);
                         break;
                     case "BundleExtensionRef":
-                        this.ParseSimpleRefElement(child, "WixBundleExtension");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleExtension);
                         break;
                     case "OptionalUpdateRegistration":
                         this.ParseOptionalUpdateRegistrationElement(child, manufacturer, parentName, name);
@@ -303,7 +301,7 @@ namespace WixToolset.Core
                         this.ParseContainerElement(child);
                         break;
                     case "ContainerRef":
-                        this.ParseSimpleRefElement(child, "WixBundleContainer");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleContainer);
                         break;
                     case "Log":
                         if (logSeen)
@@ -327,7 +325,7 @@ namespace WixToolset.Core
                         this.ParseSetVariableElement(child);
                         break;
                     case "SetVariableRef":
-                        this.ParseSimpleRefElement(child, "WixSetVariable");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixSetVariable);
                         break;
                     case "Update":
                         this.ParseUpdateElement(child);
@@ -356,7 +354,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixBundleTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new WixBundleTuple(sourceLineNumbers)
                 {
                     UpgradeCode = upgradeCode,
                     Version = version,
@@ -375,7 +373,7 @@ namespace WixToolset.Core
                     Tag = tag,
                     Platform = this.CurrentPlatform,
                     ParentName = parentName,
-                };
+                });
 
                 if (!String.IsNullOrEmpty(logVariablePrefixAndExtension))
                 {
@@ -385,8 +383,6 @@ namespace WixToolset.Core
                     tuple.LogExtension = split[2];
                 }
 
-                this.Core.AddTuple(tuple);;
-
                 if (null != upgradeCode)
                 {
                     this.Core.AddTuple(new WixRelatedBundleTuple(sourceLineNumbers)
@@ -399,32 +395,32 @@ namespace WixToolset.Core
                 this.Core.AddTuple(new WixBundleContainerTuple(sourceLineNumbers, Compiler.BurnDefaultAttachedContainerId)
                 {
                     Name = "bundle-attached.cab",
-                    Type = ContainerType.Attached
+                    Type = ContainerType.Attached,
                 });
 
                 // Ensure that the bundle stores the well-known persisted values.
                 this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_NAME))
                 {
                     Hidden = false,
-                    Persisted = true
+                    Persisted = true,
                 });
 
                 this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE))
                 {
                     Hidden = false,
-                    Persisted = true
+                    Persisted = true,
                 });
 
                 this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER))
                 {
                     Hidden = false,
-                    Persisted = true
+                    Persisted = true,
                 });
 
                 this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE))
                 {
                     Hidden = false,
-                    Persisted = true
+                    Persisted = true,
                 });
             }
         }
@@ -767,7 +763,7 @@ namespace WixToolset.Core
             }
             else
             {
-                this.Core.CreateSimpleReference(sourceLineNumbers, "WixBootstrapperApplication", id);
+                this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBootstrapperApplication, id);
             }
         }
 
@@ -830,11 +826,10 @@ namespace WixToolset.Core
             // Add the BundleExtension.
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixBundleExtensionTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new WixBundleExtensionTuple(sourceLineNumbers, id)
                 {
                     PayloadRef = id.Id,
-                };
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -1194,7 +1189,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                tuple = new WixBundlePayloadTuple(sourceLineNumbers, id)
+                tuple = this.Core.AddTuple(new WixBundlePayloadTuple(sourceLineNumbers, id)
                 {
                     Name = String.IsNullOrEmpty(name) ? Path.GetFileName(sourceFile) : name,
                     SourceFile = new IntermediateFieldPathValue { Path = sourceFile },
@@ -1204,7 +1199,7 @@ namespace WixToolset.Core
                     DisplayName = displayName,
                     Description = description,
                     EnableSignatureValidation = (YesNoType.Yes == enableSignatureVerification)
-                };
+                });
 
                 if (null != remotePayload)
                 {
@@ -1217,8 +1212,6 @@ namespace WixToolset.Core
                     tuple.Version = remotePayload.Version;
                 }
 
-                this.Core.AddTuple(tuple);
-
                 this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId.Id, ComplexReferenceChildType.Payload, id.Id, previousType, previousId?.Id);
             }
 
@@ -1322,7 +1315,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixBundlePayloadGroup", id.Id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePayloadGroup, id.Id);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -1377,15 +1370,13 @@ namespace WixToolset.Core
                 // TODO: Should we define our own enum for this, just to ensure there's no "cross-contamination"?
                 // TODO: Also, we could potentially include an 'Attributes' field to track things like
                 // 'before' vs. 'after', and explicit vs. inferred dependencies.
-                var tuple = new WixOrderingTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixOrderingTuple(sourceLineNumbers)
                 {
                     ItemType = type,
                     ItemIdRef = id,
                     DependsOnType = previousType,
                     DependsOnIdRef = previousId
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -2101,7 +2092,7 @@ namespace WixToolset.Core
                 attributes |= (YesNoType.Yes == permanent) ? WixBundlePackageAttributes.Permanent : 0;
                 attributes |= (YesNoType.Yes == visible) ? WixBundlePackageAttributes.Visible : 0;
 
-                var chainPackageTuple = new WixBundlePackageTuple(sourceLineNumbers, id)
+                var chainPackageTuple = this.Core.AddTuple(new WixBundlePackageTuple(sourceLineNumbers, id)
                 {
                     Type = packageType,
                     PayloadRef = id.Id,
@@ -2110,7 +2101,7 @@ namespace WixToolset.Core
                     CacheId = cacheId,
                     LogPathVariable = logPathVariable,
                     RollbackLogPathVariable = rollbackPathVariable,
-                };
+                });
 
                 if (YesNoAlwaysType.NotSet != cache)
                 {
@@ -2132,8 +2123,6 @@ namespace WixToolset.Core
                     chainPackageTuple.InstallSize = installSize;
                 }
 
-                this.Core.AddTuple(chainPackageTuple);
-
                 switch (packageType)
                 {
                 case WixBundlePackageType.Exe:
@@ -2370,7 +2359,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixBundlePackageGroup", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePackageGroup, id);
                         break;
                     case "After":
                         after = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
@@ -2425,7 +2414,7 @@ namespace WixToolset.Core
         {
             this.Core.AddTuple(new WixChainItemTuple(sourceLineNumbers, id));
 
-            var rollbackBoundary = new WixBundleRollbackBoundaryTuple(sourceLineNumbers, id);
+            var rollbackBoundary = this.Core.AddTuple(new WixBundleRollbackBoundaryTuple(sourceLineNumbers, id));
 
             if (YesNoType.NotSet != vital)
             {
@@ -2437,8 +2426,6 @@ namespace WixToolset.Core
                 rollbackBoundary.Transaction = (transaction == YesNoType.Yes);
             }
 
-            this.Core.AddTuple(rollbackBoundary);
-
             this.CreateChainPackageMetaRows(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.Package, id.Id, previousType, previousId, null);
         }
 
@@ -2520,19 +2507,17 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixBundleMsiPropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name))
+                var tuple = this.Core.AddTuple(new WixBundleMsiPropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name))
                 {
                     PackageRef = packageId,
                     Name = name,
                     Value = value
-                };
+                });
 
                 if (!String.IsNullOrEmpty(condition))
                 {
                     tuple.Condition = condition;
                 }
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -2554,7 +2539,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixBundlePackage", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePackage, id);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -2650,16 +2635,11 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixRelatedBundleTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixRelatedBundleTuple(sourceLineNumbers)
                 {
                     BundleId = id,
                     Action = actionType,
-                };
-
-                this.Core.AddTuple(tuple);
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixRelatedBundle);
-                //row.Set(0, id);
-                //row.Set(1, (int)actionType);
+                });
             }
         }
 
@@ -2701,12 +2681,10 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixBundleUpdateTuple(sourceLineNumbers)
+                this.Core.AddTuple(new WixBundleUpdateTuple(sourceLineNumbers)
                 {
                     Location = location
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -2773,12 +2751,11 @@ namespace WixToolset.Core
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = new WixSetVariableTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new WixSetVariableTuple(sourceLineNumbers, id)
                 {
                     Value = value,
                     Type = type,
-                };
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -2848,15 +2825,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name))
+                this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name))
                 {
                     Value = value,
                     Type = type,
                     Hidden = hidden,
                     Persisted = persisted
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
diff --git a/src/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/WixToolset.Core/Compiler_EmbeddedUI.cs
index e71c2f56..706fe6e9 100644
--- a/src/WixToolset.Core/Compiler_EmbeddedUI.cs
+++ b/src/WixToolset.Core/Compiler_EmbeddedUI.cs
@@ -42,7 +42,7 @@ namespace WixToolset.Core
                         }
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         type = 0x2;
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", source); // add a reference to the appropriate Binary
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, source); // add a reference to the appropriate Binary
                         break;
                     case "CommandLine":
                         commandLine = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -54,7 +54,7 @@ namespace WixToolset.Core
                         }
                         source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                         type = 0x12;
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "File", source); // add a reference to the appropriate File
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, source); // add a reference to the appropriate File
                         break;
                     case "PropertySource":
                         if (null != source)
@@ -317,16 +317,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MsiEmbeddedUITuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new MsiEmbeddedUITuple(sourceLineNumbers, id)
                 {
                     FileName = name,
                     EntryPoint = true,
                     SupportsBasicUI = supportsBasicUI,
                     MessageFilter = messageFilter,
                     Source = sourceFile
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -406,13 +404,11 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MsiEmbeddedUITuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new MsiEmbeddedUITuple(sourceLineNumbers, id)
                 {
                     FileName = name,
                     Source = sourceFile
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
     }
diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs
index e1563808..6166ae72 100644
--- a/src/WixToolset.Core/Compiler_Module.cs
+++ b/src/WixToolset.Core/Compiler_Module.cs
@@ -136,7 +136,7 @@ namespace WixToolset.Core
                             this.ParseCustomActionElement(child);
                             break;
                         case "CustomActionRef":
-                            this.ParseSimpleRefElement(child, "CustomAction");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction);
                             break;
                         case "CustomTable":
                             this.ParseCustomTableElement(child);
@@ -154,7 +154,7 @@ namespace WixToolset.Core
                             this.ParseEmbeddedChainerElement(child);
                             break;
                         case "EmbeddedChainerRef":
-                            this.ParseSimpleRefElement(child, "MsiEmbeddedChainer");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer);
                             break;
                         case "EnsureTable":
                             this.ParseEnsureTableElement(child);
@@ -178,7 +178,7 @@ namespace WixToolset.Core
                             this.ParsePropertyElement(child);
                             break;
                         case "PropertyRef":
-                            this.ParseSimpleRefElement(child, "Property");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.Property);
                             break;
                         case "SetDirectory":
                             this.ParseSetDirectoryElement(child);
@@ -197,7 +197,7 @@ namespace WixToolset.Core
                             this.ParseUIElement(child);
                             break;
                         case "UIRef":
-                            this.ParseSimpleRefElement(child, "WixUI");
+                            this.ParseSimpleRefElement(child, TupleDefinitions.WixUI);
                             break;
                         case "WixVariable":
                             this.ParseWixVariableElement(child);
@@ -216,15 +216,13 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    var tuple = new ModuleSignatureTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage))
+                    var tuple = this.Core.AddTuple(new ModuleSignatureTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage))
                     {
                         ModuleID = this.activeName,
                         Version = version
-                    };
+                    });
 
                     tuple.Set((int)ModuleSignatureTupleFields.Language, this.activeLanguage);
-
-                    this.Core.AddTuple(tuple);
                 }
             }
             finally
@@ -286,17 +284,15 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ModuleDependencyTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new ModuleDependencyTuple(sourceLineNumbers)
                 {
                     ModuleID = this.activeName,
                     RequiredID = requiredId,
                     RequiredLanguage  = requiredLanguage,
                     RequiredVersion = requiredVersion
-                };
+                });
 
                 tuple.Set((int)ModuleDependencyTupleFields.ModuleLanguage, this.activeLanguage);
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -369,18 +365,16 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ModuleExclusionTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new ModuleExclusionTuple(sourceLineNumbers)
                 {
                     ModuleID = this.activeName,
                     ExcludedID = excludedId,
                     ExcludedMinVersion = excludedMinVersion,
                     ExcludedMaxVersion = excludedMaxVersion
-                };
+                });
 
                 tuple.Set((int)ModuleExclusionTupleFields.ModuleLanguage, this.activeLanguage);
                 tuple.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, excludedLanguageField);
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -491,7 +485,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ModuleConfigurationTuple(sourceLineNumbers, name)
+                this.Core.AddTuple(new ModuleConfigurationTuple(sourceLineNumbers, name)
                 {
                     Format = format,
                     Type = type,
@@ -503,9 +497,7 @@ namespace WixToolset.Core
                     Description = description,
                     HelpLocation = helpLocation,
                     HelpKeyword = helpKeyword
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -571,15 +563,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ModuleSubstitutionTuple(sourceLineNumbers)
+                this.Core.AddTuple(new ModuleSubstitutionTuple(sourceLineNumbers)
                 {
                     Table = table,
                     Row = rowKeys,
                     Column = column,
                     Value = value
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs
index f8d05132..f7481143 100644
--- a/src/WixToolset.Core/Compiler_Patch.cs
+++ b/src/WixToolset.Core/Compiler_Patch.cs
@@ -197,14 +197,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new WixPatchIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId))
+                this.Core.AddTuple(new WixPatchIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId))
                 {
                     ClientPatchId = clientPatchId,
                     OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles,
-                    ApiPatchingSymbolFlags = apiPatchingSymbolFlags
-                };
-
-                this.Core.AddTuple(tuple);
+                    ApiPatchingSymbolFlags = apiPatchingSymbolFlags,
+                });
 
                 if (allowRemoval)
                 {
@@ -427,15 +425,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new MsiPatchSequenceTuple(sourceLineNumbers)
+                this.Core.AddTuple(new MsiPatchSequenceTuple(sourceLineNumbers)
                 {
                     PatchFamily = id.Id,
                     ProductCode = productCode,
                     Sequence = version,
                     Attributes = attributes
-                };
-
-                this.Core.AddTuple(tuple);
+                });
 
                 if (ComplexReferenceParentType.Unknown != parentType)
                 {
@@ -536,7 +532,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixPatchFamilyGroup", id);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixPatchFamilyGroup, id);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs
index 5994795c..3371d84e 100644
--- a/src/WixToolset.Core/Compiler_PatchCreation.cs
+++ b/src/WixToolset.Core/Compiler_PatchCreation.cs
@@ -258,13 +258,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ImageFamiliesTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new ImageFamiliesTuple(sourceLineNumbers)
                 {
                     Family = name,
                     MediaSrcPropName = mediaSrcProp,
                     DiskPrompt = diskPrompt,
                     VolumeLabel = volumeLabel
-                };
+                });
 
                 if (CompilerConstants.IntegerNotSet != diskId)
                 {
@@ -275,8 +275,6 @@ namespace WixToolset.Core
                 {
                     tuple.FileSequenceStart = sequenceStart;
                 }
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -675,16 +673,14 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new TargetFilesOptionalDataTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new TargetFilesOptionalDataTuple(sourceLineNumbers)
                 {
                     Target = target,
                     FTK = file,
                     SymbolPaths = symbols,
                     IgnoreOffsets = ignoreOffsets,
-                    IgnoreLengths = ignoreLengths
-                };
-
-                this.Core.AddTuple(tuple);
+                    IgnoreLengths = ignoreLengths,
+                });
 
                 if (null != protectOffsets)
                 {
@@ -695,7 +691,7 @@ namespace WixToolset.Core
                         Family = family,
                         FTK = file,
                         RetainOffsets = protectOffsets,
-                        RetainLengths = protectLengths
+                        RetainLengths = protectLengths,
                     });
                 }
             }
@@ -797,15 +793,15 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ExternalFilesTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new ExternalFilesTuple(sourceLineNumbers)
                 {
                     Family = family,
                     FTK = file,
                     FilePath = source,
                     SymbolPaths = symbols,
                     IgnoreOffsets = ignoreOffsets,
-                    IgnoreLengths = ignoreLengths
-                };
+                    IgnoreLengths = ignoreLengths,
+                });
 
                 if (null != protectOffsets)
                 {
@@ -817,8 +813,6 @@ namespace WixToolset.Core
                     tuple.Order = order;
                 }
 
-                this.Core.AddTuple(tuple);
-
                 if (null != protectOffsets)
                 {
                     this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers)
@@ -826,7 +820,7 @@ namespace WixToolset.Core
                         Family = family,
                         FTK = file,
                         RetainOffsets = protectOffsets,
-                        RetainLengths = protectLengths
+                        RetainLengths = protectLengths,
                     });
                 }
             }
@@ -1257,7 +1251,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Target", "ProductCode"));
                         }
                         target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "TargetImages", target);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.TargetImages, target);
                         break;
                     case "Sequence":
                         sequence = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib);
@@ -1288,15 +1282,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new PatchSequenceTuple(sourceLineNumbers)
+                this.Core.AddTuple(new PatchSequenceTuple(sourceLineNumbers)
                 {
                     PatchFamily = family,
                     Target = target,
                     Sequence = sequence,
-                    Supersede = attributes
-                };
-
-                this.Core.AddTuple(tuple);
+                    Supersede = attributes,
+                });
             }
         }
 
@@ -1306,7 +1298,7 @@ namespace WixToolset.Core
             {
                 Company = company,
                 Property = property,
-                Value = value
+                Value = value,
             });
         }
     }
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 60e89d12..3d554f12 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -76,7 +76,7 @@ namespace WixToolset.Core
                         this.ParseDialogElement(child);
                         break;
                     case "DialogRef":
-                        this.ParseSimpleRefElement(child, "Dialog");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.Dialog);
                         break;
                     case "EmbeddedUI":
                         if (0 < embeddedUICount) // there can be only one embedded UI
@@ -132,10 +132,10 @@ namespace WixToolset.Core
                         this.ParsePropertyElement(child);
                         break;
                     case "PropertyRef":
-                        this.ParseSimpleRefElement(child, "Property");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.Property);
                         break;
                     case "UIRef":
-                        this.ParseSimpleRefElement(child, "WixUI");
+                        this.ParseSimpleRefElement(child, TupleDefinitions.WixUI);
                         break;
 
                     default:
@@ -151,8 +151,7 @@ namespace WixToolset.Core
 
             if (null != id && !this.Core.EncounteredError)
             {
-                var tuple = new WixUITuple(sourceLineNumbers, id);
-                this.Core.AddTuple(tuple);
+                this.Core.AddTuple(new WixUITuple(sourceLineNumbers, id));
             }
         }
 
@@ -160,7 +159,7 @@ namespace WixToolset.Core
         /// Parses a list item element.
         /// </summary>
         /// <param name="node">Element to parse.</param>
-        /// <param name="table">Table to add row to.</param>
+        /// <param name="tupleType">Type of tuple to create.</param>
         /// <param name="property">Identifier of property referred to by list item.</param>
         /// <param name="order">Relative order of list items.</param>
         private void ParseListItemElement(XElement node, TupleDefinitionType tupleType, string property, ref int order)
@@ -180,7 +179,7 @@ namespace WixToolset.Core
                         if (TupleDefinitionType.ListView == tupleType)
                         {
                             icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", icon);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, icon);
                         }
                         else
                         {
@@ -213,14 +212,42 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = this.Core.CreateTuple(sourceLineNumbers, tupleType);
-                tuple.Set(0, property);
-                tuple.Set(1, ++order);
-                tuple.Set(2, value);
-                tuple.Set(3, text);
-                if (null != icon)
+                switch (tupleType)
                 {
-                    tuple.Set(4, icon);
+                    case TupleDefinitionType.ComboBox:
+                        this.Core.AddTuple(new ComboBoxTuple(sourceLineNumbers)
+                        {
+                            Property = property,
+                            Order = ++order,
+                            Value = value,
+                            Text = text,
+                        });
+                        break;
+                    case TupleDefinitionType.ListBox:
+                        this.Core.AddTuple(new ListBoxTuple(sourceLineNumbers)
+                        {
+                            Property = property,
+                            Order = ++order,
+                            Value = value,
+                            Text = text,
+                        });
+                        break;
+                    case TupleDefinitionType.ListView:
+                        var tuple = this.Core.AddTuple(new ListViewTuple(sourceLineNumbers)
+                        {
+                            Property = property,
+                            Order = ++order,
+                            Value = value,
+                            Text = text,
+                        });
+
+                        if (null != icon)
+                        {
+                            tuple.BinaryRef = icon;
+                        }
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(tupleType));
                 }
             }
         }
@@ -257,7 +284,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Icon", "Text"));
                         }
                         text = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", text);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text);
                         type = RadioButtonType.Bitmap;
                         break;
                     case "Height":
@@ -272,7 +299,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Bitmap", "Text"));
                         }
                         text = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", text);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text);
                         type = RadioButtonType.Icon;
                         break;
                     case "Text":
@@ -338,21 +365,19 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new RadioButtonTuple(sourceLineNumbers)
+                var tuple = this.Core.AddTuple(new RadioButtonTuple(sourceLineNumbers)
                 {
                     Property = property,
                     Order = ++order,
                     Value = value,
                     Text = text,
                     Help = (null != tooltip || null != help) ? String.Concat(tooltip, "|", help) : null
-                };
+                });
 
                 tuple.Set((int)RadioButtonTupleFields.X, x);
                 tuple.Set((int)RadioButtonTupleFields.Y, y);
                 tuple.Set((int)RadioButtonTupleFields.Width, width);
                 tuple.Set((int)RadioButtonTupleFields.Height, height);
-
-                this.Core.AddTuple(tuple);
             }
 
             return type;
@@ -376,7 +401,7 @@ namespace WixToolset.Core
                     {
                     case "Id":
                         action = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", "InstallExecuteSequence", action);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixAction, "InstallExecuteSequence", action);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -439,7 +464,7 @@ namespace WixToolset.Core
                         break;
                     case "Feature":
                         feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Feature", feature);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, feature);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -486,14 +511,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new BillboardTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new BillboardTuple(sourceLineNumbers, id)
                 {
                     FeatureRef = feature,
                     Action = action,
                     Ordering = order
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -501,7 +524,7 @@ namespace WixToolset.Core
         /// Parses a control group element.
         /// </summary>
         /// <param name="node">Element to parse.</param>
-        /// <param name="table">Table referred to by control group.</param>
+        /// <param name="tupleType">Tuple type referred to by control group.</param>
         /// <param name="childTag">Expected child elements.</param>
         private void ParseControlGroupElement(XElement node, TupleDefinitionType tupleType, string childTag)
         {
@@ -584,7 +607,7 @@ namespace WixToolset.Core
                     {
                     case "Property":
                         property = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Property", property);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, property);
                         break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
@@ -677,14 +700,12 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ActionTextTuple(sourceLineNumbers)
+                this.Core.AddTuple(new ActionTextTuple(sourceLineNumbers)
                 {
                     Action = action,
                     Description = Common.GetInnerText(node),
-                    Template = template
-                };
-
-                this.Core.AddTuple(tuple);
+                    Template = template,
+                });
             }
         }
 
@@ -729,12 +750,10 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new UITextTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new UITextTuple(sourceLineNumbers, id)
                 {
                     Text = text,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -836,7 +855,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new TextStyleTuple(sourceLineNumbers, id)
+                var tuple = this.Core.AddTuple(new TextStyleTuple(sourceLineNumbers, id)
                 {
                     FaceName = faceName,
                     Red = red,
@@ -846,11 +865,9 @@ namespace WixToolset.Core
                     Italic = italic,
                     Strike = strike,
                     Underline = underline,
-                };
+                });
 
                 tuple.Set((int)TextStyleTupleFields.Size, size);
-
-                this.Core.AddTuple(tuple);
             }
         }
 
@@ -994,7 +1011,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new DialogTuple(sourceLineNumbers, id)
+                this.Core.AddTuple(new DialogTuple(sourceLineNumbers, id)
                 {
                     HCentering = x,
                     VCentering = y,
@@ -1015,9 +1032,7 @@ namespace WixToolset.Core
                     FirstControlRef = firstControl,
                     DefaultControlRef = defaultControl,
                     CancelControlRef = cancelControl,
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
         }
 
@@ -1083,7 +1098,7 @@ namespace WixToolset.Core
                 notTabbable = true;
                 disabled = true;
 
-                this.Core.EnsureTable(sourceLineNumbers, "Billboard");
+                this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Billboard);
                 break;
             case "Bitmap":
                 specialAttributes = BitmapControlAttributes;
@@ -1449,17 +1464,15 @@ namespace WixToolset.Core
                     }
                     else if (!String.IsNullOrEmpty(property))
                     {
-                        var checkBoxTuple = new CheckBoxTuple(sourceLineNumbers)
+                        this.Core.AddTuple(new CheckBoxTuple(sourceLineNumbers)
                         {
                             Property = property,
-                            Value = checkboxValue
-                        };
-
-                        this.Core.AddTuple(checkBoxTuple);
+                            Value = checkboxValue,
+                        });
                     }
                     else
                     {
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "CheckBox", checkBoxPropertyRef);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.CheckBox, checkBoxPropertyRef);
                     }
                 }
 
@@ -1467,7 +1480,7 @@ namespace WixToolset.Core
 
                 if (TupleDefinitionType.BBControl == tupleType)
                 {
-                    var bbTuple = new BBControlTuple(sourceLineNumbers, id)
+                    var bbTuple = this.Core.AddTuple(new BBControlTuple(sourceLineNumbers, id)
                     {
                         BillboardRef = dialog,
                         BBControl = controlId.Id,
@@ -1482,21 +1495,19 @@ namespace WixToolset.Core
                         Sunken = sunken,
                         Visible = !hidden,
                         Text = text,
-                        SourceFile = sourceFile
-                    };
+                        SourceFile = sourceFile,
+                    });
 
                     bbTuple.Set((int)BBControlTupleFields.X, x);
                     bbTuple.Set((int)BBControlTupleFields.Y, y);
                     bbTuple.Set((int)BBControlTupleFields.Width, width);
                     bbTuple.Set((int)BBControlTupleFields.Height, height);
 
-                    this.Core.AddTuple(bbTuple);
-
                     tuple = bbTuple;
                 }
                 else
                 {
-                    var controlTuple = new ControlTuple(sourceLineNumbers, id)
+                    var controlTuple = this.Core.AddTuple(new ControlTuple(sourceLineNumbers, id)
                     {
                         DialogRef = dialog,
                         Control = controlId.Id,
@@ -1514,15 +1525,13 @@ namespace WixToolset.Core
                         Text = text,
                         Help = (null == tooltip && null == help) ? null : String.Concat(tooltip, "|", help), // Separator is required, even if only one is non-null.};
                         SourceFile = sourceFile
-                    };
+                    });
 
                     controlTuple.Set((int)BBControlTupleFields.X, x);
                     controlTuple.Set((int)BBControlTupleFields.Y, y);
                     controlTuple.Set((int)BBControlTupleFields.Width, width);
                     controlTuple.Set((int)BBControlTupleFields.Height, height);
 
-                    this.Core.AddTuple(controlTuple);
-
                     tuple = controlTuple;
                 }
             }
@@ -1552,7 +1561,7 @@ namespace WixToolset.Core
             // add a reference if the identifier of the binary entry is known during compilation
             if (("Bitmap" == controlType || "Icon" == controlType) && Common.IsIdentifier(text))
             {
-                this.Core.CreateSimpleReference(sourceLineNumbers, "Binary", text);
+                this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text);
             }
         }
 
@@ -1593,7 +1602,7 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
                         }
                         dialog = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                        this.Core.CreateSimpleReference(sourceLineNumbers, "Dialog", dialog);
+                        this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, dialog);
                         break;
                     case "Event":
                         controlEvent = Compiler.UppercaseFirstChar(this.Core.GetAttributeValue(sourceLineNumbers, attrib));
@@ -1656,7 +1665,7 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new ControlEventTuple(sourceLineNumbers)
+                this.Core.AddTuple(new ControlEventTuple(sourceLineNumbers)
                 {
                     DialogRef = dialog,
                     ControlRef = control,
@@ -1664,9 +1673,7 @@ namespace WixToolset.Core
                     Argument = argument,
                     Condition = condition,
                     Ordering = order
-                };
-
-                this.Core.AddTuple(tuple);
+                });
             }
 
             if ("DoAction" == controlEvent && null != argument)
@@ -1675,14 +1682,14 @@ namespace WixToolset.Core
                 // to the custom action.
                 if (!WindowsInstallerStandard.IsStandardAction(argument) && !Common.ContainsProperty(argument))
                 {
-                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", argument);
+                    this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.CustomAction, argument);
                 }
             }
 
             // if we're referring to a dialog but not through a property, add it to the references
             if (("NewDialog" == controlEvent || "SpawnDialog" == controlEvent || "SpawnWaitDialog" == controlEvent || "SelectionBrowse" == controlEvent) && Common.IsIdentifier(argument))
             {
-                this.Core.CreateSimpleReference(sourceLineNumbers, "Dialog", argument);
+                this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, argument);
             }
         }
 
@@ -1725,15 +1732,13 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                var tuple = new EventMappingTuple(sourceLineNumbers)
+                this.Core.AddTuple(new EventMappingTuple(sourceLineNumbers)
                 {
                     DialogRef = dialog,
                     ControlRef = control,
                     Event = eventMapping,
-                    Attribute = controlAttribute
-                }; ;
-
-                this.Core.AddTuple(tuple);
+                    Attribute = controlAttribute,
+                });
             }
         }
     }
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index f07e4638..3c092bd4 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -54,7 +54,7 @@ namespace WixToolset.Core.ExtensibilityServices
         public void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary)
         {
 
-            var tuple = new WixComplexReferenceTuple(sourceLineNumbers)
+            section.AddTuple(new WixComplexReferenceTuple(sourceLineNumbers)
             {
                 Parent = parentId,
                 ParentType = parentType,
@@ -62,9 +62,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 Child = childId,
                 ChildType = childType,
                 IsPrimary = isPrimary
-            };
-
-            section.Tuples.Add(tuple);
+            });
 
             this.CreateWixGroupTuple(section, sourceLineNumbers, parentType, parentId, childType, childId);
         }
@@ -100,24 +98,22 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
             }
 
-            var tuple = new DirectoryTuple(sourceLineNumbers, id)
+            var tuple = section.AddTuple(new DirectoryTuple(sourceLineNumbers, id)
             {
                 ParentDirectoryRef = parentId,
                 Name = name,
                 ShortName = shortName,
                 SourceName = sourceName,
                 SourceShortName = shortSourceName
-            };
-
-            section.Tuples.Add(tuple);
+            });
 
-            return id;
+            return tuple.Id;
         }
 
         public string CreateDirectoryReferenceFromInlineSyntax(IntermediateSection section, SourceLineNumber sourceLineNumbers, string parentId, XAttribute attribute, ISet<string> sectionInlinedDirectoryIds)
         {
             string id = null;
-            string[] inlineSyntax = this.GetAttributeInlineDirectorySyntax(sourceLineNumbers, attribute, true);
+            var inlineSyntax = this.GetAttributeInlineDirectorySyntax(sourceLineNumbers, attribute, true);
 
             if (null != inlineSyntax)
             {
@@ -126,13 +122,13 @@ namespace WixToolset.Core.ExtensibilityServices
                 if (1 == inlineSyntax.Length)
                 {
                     id = inlineSyntax[0];
-                    this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.Directory), id);
+                    this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, id);
                 }
                 else // start creating tuples for the entries in the inline syntax
                 {
                     id = parentId;
 
-                    int pathStartsAt = 0;
+                    var pathStartsAt = 0;
                     if (inlineSyntax[0].EndsWith(":"))
                     {
                         // TODO: should overriding the parent identifier with a specific id be an error or a warning or just let it slide?
@@ -142,14 +138,14 @@ namespace WixToolset.Core.ExtensibilityServices
                         //}
 
                         id = inlineSyntax[0].TrimEnd(':');
-                        this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.Directory), id);
+                        this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, id);
 
                         pathStartsAt = 1;
                     }
 
-                    for (int i = pathStartsAt; i < inlineSyntax.Length; ++i)
+                    for (var i = pathStartsAt; i < inlineSyntax.Length; ++i)
                     {
-                        Identifier inlineId = this.CreateDirectoryTuple(section, sourceLineNumbers, null, id, inlineSyntax[i], sectionInlinedDirectoryIds);
+                        var inlineId = this.CreateDirectoryTuple(section, sourceLineNumbers, null, id, inlineSyntax[i], sectionInlinedDirectoryIds);
                         id = inlineId.Id;
                     }
                 }
@@ -206,29 +202,25 @@ namespace WixToolset.Core.ExtensibilityServices
 
             var id = this.CreateIdentifier("reg", componentId, ((int)root).ToString(CultureInfo.InvariantCulture.NumberFormat), key.ToLowerInvariant(), (null != name ? name.ToLowerInvariant() : name));
 
-            var tuple = new RegistryTuple(sourceLineNumbers, id)
+            var tuple = section.AddTuple(new RegistryTuple(sourceLineNumbers, id)
             {
                 Root = root,
                 Key = key,
                 Name = name,
                 Value = value,
                 ComponentRef = componentId,
-            };
-
-            section.Tuples.Add(tuple);
+            });
 
-            return id;
+            return tuple.Id;
         }
 
         public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys)
         {
-            var tuple = new WixSimpleReferenceTuple(sourceLineNumbers)
+            section.AddTuple(new WixSimpleReferenceTuple(sourceLineNumbers)
             {
                 Table = tupleName,
                 PrimaryKeys = String.Join("/", primaryKeys)
-            };
-
-            section.Tuples.Add(tuple);
+            });
         }
 
         public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys)
@@ -254,15 +246,13 @@ namespace WixToolset.Core.ExtensibilityServices
                 throw new ArgumentNullException("childId");
             }
 
-            var tuple = new WixGroupTuple(sourceLineNumbers)
+            section.AddTuple(new WixGroupTuple(sourceLineNumbers)
             {
                 ParentId = parentId,
                 ParentType = parentType,
                 ChildId = childId,
                 ChildType = childType,
-            };
-
-            section.Tuples.Add(tuple);
+            });
         }
 
         public void CreateWixSearchTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId)
@@ -273,7 +263,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, elementName, "Variable"));
             }
 
-            section.Tuples.Add(new WixSearchTuple(sourceLineNumbers, id)
+            section.AddTuple(new WixSearchTuple(sourceLineNumbers, id)
             {
                 Variable = variable,
                 Condition = condition,
@@ -282,20 +272,20 @@ namespace WixToolset.Core.ExtensibilityServices
 
             if (after != null)
             {
-                this.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
+                this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, after);
                 // TODO: We're currently defaulting to "always run after", which we will need to change...
                 this.CreateWixSearchRelationTuple(section, sourceLineNumbers, id, after, 2);
             }
 
             if (!String.IsNullOrEmpty(bundleExtensionId))
             {
-                this.CreateSimpleReference(section, sourceLineNumbers, "WixBundleExtension", bundleExtensionId);
+                this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundleExtension, bundleExtensionId);
             }
         }
 
         public void CreateWixSearchRelationTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes)
         {
-            section.Tuples.Add(new WixSearchRelationTuple(sourceLineNumbers, id)
+            section.AddTuple(new WixSearchRelationTuple(sourceLineNumbers, id)
             {
                 ParentSearchRef = parentId,
                 Attributes = attributes,
@@ -351,13 +341,13 @@ namespace WixToolset.Core.ExtensibilityServices
             }
 
             // collect all the data
-            List<string> strings = new List<string>(1 + args.Length);
+            var strings = new List<string>(1 + args.Length);
             strings.Add(longName);
             strings.AddRange(args);
 
             // prepare for hashing
-            string stringData = String.Join("|", strings);
-            byte[] data = Encoding.UTF8.GetBytes(stringData);
+            var stringData = String.Join("|", strings);
+            var data = Encoding.UTF8.GetBytes(stringData);
 
             // hash the data
             byte[] hash;
@@ -367,12 +357,12 @@ namespace WixToolset.Core.ExtensibilityServices
             }
 
             // generate the short file/directory name without an extension
-            StringBuilder shortName = new StringBuilder(Convert.ToBase64String(hash));
+            var shortName = new StringBuilder(Convert.ToBase64String(hash));
             shortName.Remove(8, shortName.Length - 8).Replace('+', '-').Replace('/', '_');
 
             if (keepExtension)
             {
-                string extension = Path.GetExtension(longName);
+                var extension = Path.GetExtension(longName);
 
                 if (4 < extension.Length)
                 {
@@ -405,9 +395,9 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public void EnsureTable(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName)
         {
-            section.Tuples.Add(new WixEnsureTableTuple(sourceLineNumbers)
+            section.AddTuple(new WixEnsureTableTuple(sourceLineNumbers)
             {
-                Table = tableName
+                Table = tableName,
             });
 
             if (this.Creator == null)
@@ -419,7 +409,7 @@ namespace WixToolset.Core.ExtensibilityServices
             // We don't add custom table definitions to the tableDefinitions collection,
             // so if it's not in there, it better be a custom table. If the Id is just wrong,
             // instead of a custom table, we get an unresolved reference at link time.
-            if (!this.Creator.TryGetTupleDefinitionByName(tableName, out var ignored))
+            if (!this.Creator.TryGetTupleDefinitionByName(tableName, out var _))
             {
                 this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixCustomTable, tableName);
             }
@@ -432,8 +422,8 @@ namespace WixToolset.Core.ExtensibilityServices
                 throw new ArgumentNullException("attribute");
             }
 
-            EmptyRule emptyRule = canBeEmpty ? EmptyRule.CanBeEmpty : EmptyRule.CanBeWhitespaceOnly;
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute, emptyRule);
+            var emptyRule = canBeEmpty ? EmptyRule.CanBeEmpty : EmptyRule.CanBeWhitespaceOnly;
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute, emptyRule);
 
             if (String.IsNullOrEmpty(value) && canBeEmpty)
             {
@@ -516,15 +506,15 @@ namespace WixToolset.Core.ExtensibilityServices
         public string[] GetAttributeInlineDirectorySyntax(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool resultUsedToCreateReference = false)
         {
             string[] result = null;
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute);
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute);
 
             if (!String.IsNullOrEmpty(value))
             {
-                int pathStartsAt = 0;
+                var pathStartsAt = 0;
                 result = value.Split(new char[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
                 if (result[0].EndsWith(":", StringComparison.Ordinal))
                 {
-                    string id = result[0].TrimEnd(':');
+                    var id = result[0].TrimEnd(':');
                     if (1 == result.Length)
                     {
                         this.Messaging.Write(ErrorMessages.InlineDirectorySyntaxRequiresPath(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value, id));
@@ -558,7 +548,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
 
                 // Check each part of the relative path to ensure that it is a valid directory name.
-                for (int i = pathStartsAt; i < result.Length; ++i)
+                for (var i = pathStartsAt; i < result.Length; ++i)
                 {
                     if (!this.IsValidLongFilename(result[i], false, false))
                     {
@@ -588,7 +578,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 throw new ArgumentNullException("attribute");
             }
 
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute);
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute);
 
             if (0 < value.Length)
             {
@@ -605,7 +595,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
                 else if (allowRelative)
                 {
-                    string normalizedPath = value.Replace('\\', '/');
+                    var normalizedPath = value.Replace('\\', '/');
                     if (normalizedPath.StartsWith("../", StringComparison.Ordinal) || normalizedPath.Contains("/../"))
                     {
                         this.Messaging.Write(ErrorMessages.PayloadMustBeRelativeToCache(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
@@ -624,13 +614,13 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             Debug.Assert(minimum > CompilerConstants.LongNotSet && minimum > CompilerConstants.IllegalLong, "The legal values for this attribute collide with at least one sentinel used during parsing.");
 
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute);
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute);
 
             if (0 < value.Length)
             {
                 try
                 {
-                    long longValue = Convert.ToInt64(value, CultureInfo.InvariantCulture.NumberFormat);
+                    var longValue = Convert.ToInt64(value, CultureInfo.InvariantCulture.NumberFormat);
 
                     if (CompilerConstants.LongNotSet == longValue || CompilerConstants.IllegalLong == longValue)
                     {
@@ -664,7 +654,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public RegistryRootType? GetAttributeRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu)
         {
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute);
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute);
             if (String.IsNullOrEmpty(value))
             {
                 return null;
@@ -814,8 +804,8 @@ namespace WixToolset.Core.ExtensibilityServices
             }
 
             // Check for a non-period character (all periods is not legal)
-            bool nonPeriodFound = false;
-            foreach (char character in filename)
+            var nonPeriodFound = false;
+            foreach (var character in filename)
             {
                 if ('.' != character)
                 {
@@ -867,7 +857,6 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             if (ParseHelper.TryFindExtension(extensions, element.Name.Namespace, out var extension))
             {
-                SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(parentElement);
                 extension.ParseElement(intermediate, section, parentElement, element, context);
             }
             else
@@ -896,7 +885,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public void ParseForExtensionElements(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement element)
         {
-            foreach (XElement child in element.Elements())
+            foreach (var child in element.Elements())
             {
                 if (element.Name.Namespace == child.Name.Namespace)
                 {
@@ -913,7 +902,7 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             var actionId = new Identifier(access, sequence, actionName);
 
-            var actionTuple = new WixActionTuple(sourceLineNumbers, actionId)
+            var actionTuple = section.AddTuple(new WixActionTuple(sourceLineNumbers, actionId)
             {
                 SequenceTable = sequence,
                 Action = actionName,
@@ -921,19 +910,17 @@ namespace WixToolset.Core.ExtensibilityServices
                 Before = beforeAction,
                 After = afterAction,
                 Overridable = overridable,
-            };
-
-            section.Tuples.Add(actionTuple);
+            });
 
             if (null != beforeAction)
             {
                 if (WindowsInstallerStandard.IsStandardAction(beforeAction))
                 {
-                    this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.WixAction), sequence.ToString(), beforeAction);
+                    this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), beforeAction);
                 }
                 else
                 {
-                    this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), beforeAction);
+                    this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, beforeAction);
                 }
             }
 
@@ -941,11 +928,11 @@ namespace WixToolset.Core.ExtensibilityServices
             {
                 if (WindowsInstallerStandard.IsStandardAction(afterAction))
                 {
-                    this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.WixAction), sequence.ToString(), afterAction);
+                    this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), afterAction);
                 }
                 else
                 {
-                    this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), afterAction);
+                    this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, afterAction);
                 }
             }
 
@@ -981,7 +968,7 @@ namespace WixToolset.Core.ExtensibilityServices
                         break;
                 }
 
-                this.CreateSimpleReference(section, sourceLineNumbers, nameof(TupleDefinitionType.CustomAction), name + suffix);
+                this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, name + suffix);
             }
         }
 
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index 563cd565..7e0030ca 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -171,15 +171,15 @@ namespace WixToolset.Core.Link
             // does WiX (although they do, currently). We probably want to "upgrade" this to a new
             // table that includes a sequence number, and then change the code that uses ordered
             // groups to read from that table instead.
-            foreach (Item item in orderedItems)
+            foreach (var item in orderedItems)
             {
-                var row = new WixGroupTuple(item.Row.SourceLineNumbers);
-                row.ParentId = parentId;
-                row.ParentType = (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), parentType);
-                row.ChildId = item.Id;
-                row.ChildType = (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), item.Type);
-
-                this.EntrySection.Tuples.Add(row);
+                this.EntrySection.AddTuple(new WixGroupTuple(item.Row.SourceLineNumbers)
+                {
+                    ParentId = parentId,
+                    ParentType = (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), parentType),
+                    ChildId = item.Id,
+                    ChildType = (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), item.Type),
+                });
             }
         }
 
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index bc4f5774..4c4c6063 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -211,9 +211,6 @@ namespace WixToolset.Core
                 // resolve the feature to feature connects
                 this.ResolveFeatureToFeatureConnects(featuresToFeatures, find.Symbols);
 
-                // start generating OutputTables and OutputRows for all the sections in the output
-                var ensureTableRows = new List<IntermediateTuple>();
-
                 // Create the section to hold the linked content.
                 var resolvedSection = new IntermediateSection(find.EntrySection.Id, find.EntrySection.Type, find.EntrySection.Codepage);
 
@@ -239,7 +236,7 @@ namespace WixToolset.Core
                             case TupleDefinitionType.Class:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 2, 11, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)ClassTupleFields.ComponentRef, (int)ClassTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
@@ -294,7 +291,7 @@ namespace WixToolset.Core
                             case TupleDefinitionType.Extension:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 1, 4, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)ExtensionTupleFields.ComponentRef, (int)ExtensionTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
@@ -311,35 +308,31 @@ namespace WixToolset.Core
                             case TupleDefinitionType.Assembly:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 0, 1, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)AssemblyTupleFields.ComponentRef, (int)AssemblyTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case TupleDefinitionType.PublishComponent:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 2, 4, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)PublishComponentTupleFields.ComponentRef, (int)PublishComponentTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case TupleDefinitionType.Shortcut:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 3, 4, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)ShortcutTupleFields.ComponentRef, (int)ShortcutTupleFields.Target, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
                             case TupleDefinitionType.TypeLib:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 2, 6, componentsToFeatures, multipleFeatureComponents);
+                                    this.ResolveFeatures(tuple, (int)TypeLibTupleFields.ComponentRef, (int)TypeLibTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);
                                 }
                                 break;
 
-                            case TupleDefinitionType.WixEnsureTable:
-                                ensureTableRows.Add(tuple);
-                                break;
-
 #if MOVE_TO_BACKEND
                             case "WixFile":
                                 foreach (Row row in table.Rows)
@@ -404,7 +397,7 @@ namespace WixToolset.Core
 
                         if (copyTuple)
                         {
-                            resolvedSection.Tuples.Add(tuple);
+                            resolvedSection.AddTuple(tuple);
                         }
                     }
                 }
@@ -414,13 +407,11 @@ namespace WixToolset.Core
                 {
                     foreach (var feature in connectToFeature.ConnectFeatures)
                     {
-                        var row = new WixFeatureModulesTuple
+                        resolvedSection.AddTuple(new WixFeatureModulesTuple
                         {
                             FeatureRef = feature,
                             WixMergeRef = connectToFeature.ChildId
-                        };
-
-                        resolvedSection.Tuples.Add(row);
+                        });
                     }
                 }
 
@@ -554,9 +545,9 @@ namespace WixToolset.Core
 #endif
 
                 // copy the wix variable rows to the output after all overriding has been accounted for.
-                foreach (var row in wixVariables.Values)
+                foreach (var tuple in wixVariables.Values)
                 {
-                    resolvedSection.Tuples.Add(row);
+                    resolvedSection.AddTuple(tuple);
                 }
 
                 // Bundles have groups of data that must be flattened in a way different from other types.
@@ -774,9 +765,8 @@ namespace WixToolset.Core
 
             foreach (var section in sections)
             {
-                var featureComponents = new List<FeatureComponentsTuple>();
-
-                foreach (var wixComplexReferenceRow in section.Tuples.OfType<WixComplexReferenceTuple>())
+                // Need ToList since we might want to add tuples while processing.
+                foreach (var wixComplexReferenceRow in section.Tuples.OfType<WixComplexReferenceTuple>().ToList())
                 {
                     ConnectToFeature connection;
                     switch (wixComplexReferenceRow.ParentType)
@@ -810,11 +800,11 @@ namespace WixToolset.Core
                                     }
 
                                     // add a row to the FeatureComponents table
-                                    var featureComponent = new FeatureComponentsTuple();
-                                    featureComponent.FeatureRef = wixComplexReferenceRow.Parent;
-                                    featureComponent.ComponentRef = wixComplexReferenceRow.Child;
-
-                                    featureComponents.Add(featureComponent);
+                                    section.AddTuple(new FeatureComponentsTuple
+                                    {
+                                        FeatureRef = wixComplexReferenceRow.Parent,
+                                        ComponentRef = wixComplexReferenceRow.Child,
+                                    });
 
                                     // index the component for finding orphaned records
                                     var symbolName = String.Concat("Component:", wixComplexReferenceRow.Child);
@@ -878,10 +868,12 @@ namespace WixToolset.Core
                                         componentsToModules.Add(wixComplexReferenceRow.Child, wixComplexReferenceRow); // should always be new
 
                                         // add a row to the ModuleComponents table
-                                        var moduleComponent = new ModuleComponentsTuple();
-                                        moduleComponent.Component = wixComplexReferenceRow.Child;
-                                        moduleComponent.ModuleID = wixComplexReferenceRow.Parent;
-                                        moduleComponent.Language = Convert.ToInt32(wixComplexReferenceRow.ParentLanguage);
+                                        section.AddTuple(new ModuleComponentsTuple
+                                        {
+                                            Component = wixComplexReferenceRow.Child,
+                                            ModuleID = wixComplexReferenceRow.Parent,
+                                            Language = Convert.ToInt32(wixComplexReferenceRow.ParentLanguage),
+                                        });
                                     }
 
                                     // index the component for finding orphaned records
@@ -931,11 +923,6 @@ namespace WixToolset.Core
                             throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceParentType), wixComplexReferenceRow.ParentType)));
                     }
                 }
-
-                foreach (var featureComponent in featureComponents)
-                {
-                    section.Tuples.Add(featureComponent);
-                }
             }
         }
 
@@ -1048,7 +1035,7 @@ namespace WixToolset.Core
                         (ComplexReferenceParentType.ComponentGroup != wixComplexReferenceRow.ParentType) &&
                         (ComplexReferenceParentType.PatchFamilyGroup != wixComplexReferenceRow.ParentType))
                     {
-                        section.Tuples.Add(wixComplexReferenceRow);
+                        section.AddTuple(wixComplexReferenceRow);
                     }
                 }
             }
@@ -1322,15 +1309,15 @@ namespace WixToolset.Core
         /// <summary>
         /// Resolve features for columns that have null guid placeholders.
         /// </summary>
-        /// <param name="rows">Rows to resolve.</param>
+        /// <param name="tuple">Tuple to resolve.</param>
         /// <param name="connectionColumn">Number of the column containing the connection identifier.</param>
         /// <param name="featureColumn">Number of the column containing the feature.</param>
         /// <param name="connectToFeatures">Connect to feature complex references.</param>
         /// <param name="multipleFeatureComponents">Hashtable of known components under multiple features.</param>
-        private void ResolveFeatures(IntermediateTuple row, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents)
+        private void ResolveFeatures(IntermediateTuple tuple, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents)
         {
-            var connectionId = row.AsString(connectionColumn);
-            var featureId = row.AsString(featureColumn);
+            var connectionId = tuple.AsString(connectionColumn);
+            var featureId = tuple.AsString(featureColumn);
 
             if (EmptyGuid == featureId)
             {
@@ -1338,14 +1325,14 @@ namespace WixToolset.Core
 
                 if (null == connection)
                 {
-                    // display an error for the component or merge module as approrpriate
+                    // display an error for the component or merge module as appropriate
                     if (null != multipleFeatureComponents)
                     {
-                        this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(row.SourceLineNumbers, connectionId, row.Definition.Name, row.Id.Id));
+                        this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(tuple.SourceLineNumbers, connectionId, tuple.Definition.Name, tuple.Id.Id));
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(row.SourceLineNumbers, connectionId));
+                        this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(tuple.SourceLineNumbers, connectionId));
                     }
                 }
                 else
@@ -1373,7 +1360,7 @@ namespace WixToolset.Core
                     }
 
                     // set the feature
-                    row.Set(featureColumn, connection.PrimaryFeature);
+                    tuple.Set(featureColumn, connection.PrimaryFeature);
                 }
             }
         }
diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs
index 9f0abd4c..0005b1d5 100644
--- a/src/test/Example.Extension/ExampleCompilerExtension.cs
+++ b/src/test/Example.Extension/ExampleCompilerExtension.cs
@@ -157,10 +157,10 @@ namespace Example.Extension
 
             if (!this.Messaging.EncounteredError)
             {
-
-                var tuple = new ExampleSearchTuple(sourceLineNumbers, id);
-                section.Tuples.Add(tuple);
-                tuple.SearchFor = searchFor;
+                var tuple = section.AddTuple(new ExampleSearchTuple(sourceLineNumbers, id)
+                {
+                    SearchFor = searchFor,
+                });
             }
         }
 
@@ -176,7 +176,7 @@ namespace Example.Extension
                     {
                         case "Id":
                             var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "ExampleSearch", refId);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleTupleDefinitions.ExampleSearch, refId);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);