Code cleanup

5 files changed, 117 insertions, 606 deletions

diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
index cd3660e4..1cf8cf12 100644
--- a/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
+++ b/src/WixToolset.Data/WindowsInstaller/Rows/FileRow.cs
@@ -2,41 +2,13 @@
 
 namespace WixToolset.Data.WindowsInstaller.Rows
 {
-    using System;
     using System.Diagnostics;
-    using System.Globalization;
 
     /// <summary>
     /// Specialization of a row for the file table.
     /// </summary>
-    public sealed class FileRow : Row //, IComparable
+    public sealed class FileRow : Row
     {
-        //private string assemblyApplication;
-        //private string assemblyManifest;
-        //private FileAssemblyType assemblyType;
-        //private string directory;
-        //private int diskId;
-        //private bool fromModule;
-        //private bool isGeneratedShortFileName;
-        //private int patchGroup;
-        //private string processorArchitecture;
-        //private string source;
-        //private Row hashRow;
-        //private List<Row> assemblyNameRows;
-        //private string[] previousSource;
-        //private string symbols;
-        //private string[] previousSymbols;
-        //private PatchAttributeType patchAttributes;
-        //private string retainOffsets;
-        //private string retainLengths;
-        //private string ignoreOffsets;
-        //private string ignoreLengths;
-        //private string[] previousRetainOffsets;
-        //private string[] previousRetainLengths;
-        //private string[] previousIgnoreOffsets;
-        //private string[] previousIgnoreLengths;
-        //private string patch;
-
         /// <summary>
         /// Creates a File row that belongs to a table.
         /// </summary>
@@ -45,13 +17,6 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         public FileRow(SourceLineNumber sourceLineNumbers, Table table)
             : base(sourceLineNumbers, table)
         {
-            //this.assemblyType = FileAssemblyType.NotAnAssembly;
-            //this.previousSource = new string[1];
-            //this.previousSymbols = new string[1];
-            //this.previousRetainOffsets = new string[1];
-            //this.previousRetainLengths = new string[1];
-            //this.previousIgnoreOffsets = new string[1];
-            //this.previousIgnoreLengths = new string[1];
         }
 
         /// <summary>
@@ -62,13 +27,6 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         public FileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
             : base(sourceLineNumbers, tableDefinition)
         {
-            //this.assemblyType = FileAssemblyType.NotAnAssembly;
-            //this.previousSource = new string[1];
-            //this.previousSymbols = new string[1];
-            //this.previousRetainOffsets = new string[1];
-            //this.previousRetainLengths = new string[1];
-            //this.previousIgnoreOffsets = new string[1];
-            //this.previousIgnoreLengths = new string[1];
         }
 
         /// <summary>
@@ -77,8 +35,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Primary key of the file row.</value>
         public string File
         {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
+            get => this.FieldAsString(0);
+            set => this.Fields[0].Data = value;
         }
 
         /// <summary>
@@ -87,8 +45,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Component this file row belongs to.</value>
         public string Component
         {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
+            get => this.FieldAsString(1);
+            set => this.Fields[1].Data = value;
         }
 
         /// <summary>
@@ -97,8 +55,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Name of the file.</value>
         public string FileName
         {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
+            get => this.FieldAsString(2);
+            set => this.Fields[2].Data = value;
         }
 
         /// <summary>
@@ -110,18 +68,12 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
             get
             {
-                string fileName = this.FileName;
-                int index = fileName.IndexOf('|');
+                var fileName = this.FileName;
+                var index = fileName.IndexOf('|');
 
                 // If it doesn't contain a pipe, just return the whole string
-                if (-1 == index)
-                {
-                    return fileName;
-                }
-                else // otherwise, extract the part of the string after the pipe
-                {
-                    return fileName.Substring(index + 1);
-                }
+                // otherwise, extract the part of the string after the pipe.
+                return (-1 == index) ? fileName : fileName.Substring(index + 1);
             }
         }
 
@@ -131,8 +83,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Size of the file.</value>
         public int FileSize
         {
-            get { return (int)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
+            get => this.FieldAsInteger(3);
+            set => this.Fields[3].Data = value;
         }
 
         /// <summary>
@@ -141,8 +93,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Version of the file.</value>
         public string Version
         {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
+            get => this.FieldAsString(4);
+            set => this.Fields[4].Data = value;
         }
 
         /// <summary>
@@ -151,8 +103,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>LCID of the file.</value>
         public string Language
         {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
+            get => this.FieldAsString(5);
+            set => this.Fields[5].Data = value;
         }
 
         /// <summary>
@@ -161,8 +113,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Attributes on a file.</value>
         public int Attributes
         {
-            get { return Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture); }
-            set { this.Fields[6].Data = value; }
+            get => this.FieldAsInteger(6);
+            set => this.Fields[6].Data = value;
         }
 
         /// <summary>
@@ -173,8 +125,8 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         {
             get
             {
-                bool compressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed));
-                bool noncompressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed));
+                var compressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed));
+                var noncompressedFlag = (0 < (this.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed));
 
                 if (compressedFlag && noncompressedFlag)
                 {
@@ -225,415 +177,38 @@ namespace WixToolset.Data.WindowsInstaller.Rows
         /// <value>Sequence of the file row.</value>
         public int Sequence
         {
-            get { return (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
+            get => this.FieldAsInteger(7);
+            set => this.Fields[7].Data = value;
         }
 
-        /////// <summary>
-        /////// Gets or sets the type of assembly of file row.
-        /////// </summary>
-        /////// <value>Assembly type for file row.</value>
-        ////public FileAssemblyType AssemblyType
-        ////{
-        ////    get { return this.assemblyType; }
-        ////    set { this.assemblyType = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the identifier for the assembly application.
-        /////// </summary>
-        /////// <value>Identifier for the assembly application.</value>
-        ////public string AssemblyApplication
-        ////{
-        ////    get { return this.assemblyApplication; }
-        ////    set { this.assemblyApplication = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the identifier for the assembly manifest.
-        /////// </summary>
-        /////// <value>Identifier for the assembly manifest.</value>
-        ////public string AssemblyManifest
-        ////{
-        ////    get { return this.assemblyManifest; }
-        ////    set { this.assemblyManifest = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the directory of the file.
-        /////// </summary>
-        /////// <value>Directory of the file.</value>
-        ////public string Directory
-        ////{
-        ////    get { return this.directory; }
-        ////    set { this.directory = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the disk id for this file.
-        /////// </summary>
-        /////// <value>Disk id for the file.</value>
-        ////public int DiskId
-        ////{
-        ////    get { return this.diskId; }
-        ////    set { this.diskId = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the source location to the file.
-        /////// </summary>
-        /////// <value>Source location to the file.</value>
-        ////public string Source
-        ////{
-        ////    get { return this.source; }
-        ////    set { this.source = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the source location to the previous file.
-        /////// </summary>
-        /////// <value>Source location to the previous file.</value>
-        ////public string PreviousSource
-        ////{
-        ////    get { return this.previousSource[0]; }
-        ////    set { this.previousSource[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the source location to the previous files.
-        /////// </summary>
-        /////// <value>Source location to the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousSourceArray
-        ////{
-        ////    get { return this.previousSource; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the architecture the file executes on.
-        /////// </summary>
-        /////// <value>Architecture the file executes on.</value>
-        ////public string ProcessorArchitecture
-        ////{
-        ////    get { return this.processorArchitecture; }
-        ////    set { this.processorArchitecture = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets of sets the patch group of a patch-added file.
-        /////// </summary>
-        /////// <value>The patch group of a patch-added file.</value>
-        ////public int PatchGroup
-        ////{
-        ////    get { return this.patchGroup; }
-        ////    set { this.patchGroup = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the patch header of the file.
-        /////// </summary>
-        /////// <value>Patch header of the file.</value>
-        ////public string Patch
-        ////{
-        ////    get { return this.patch; }
-        ////    set { this.patch = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the locations to find the file's symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the file.</value>
-        ////public string Symbols
-        ////{
-        ////    get { return this.symbols; }
-        ////    set { this.symbols = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the locations to find the file's previous symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the previous file.</value>
-        ////public string PreviousSymbols
-        ////{
-        ////    get { return this.previousSymbols[0]; }
-        ////    set { this.previousSymbols[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the locations to find the files' previous symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousSymbolsArray
-        ////{
-        ////    get { return this.previousSymbols; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the generated short file name attribute.
-        /////// </summary>
-        /////// <value>The generated short file name attribute.</value>
-        ////public bool IsGeneratedShortFileName
-        ////{
-        ////    get { return this.isGeneratedShortFileName; }
-
-        ////    set { this.isGeneratedShortFileName = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets whether this row came from a merge module.
-        /////// </summary>
-        /////// <value>Whether this row came from a merge module.</value>
-        ////public bool FromModule
-        ////{
-        ////    get { return this.fromModule; }
-        ////    set { this.fromModule = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the MsiFileHash row created for this FileRow.
-        /////// </summary>
-        /////// <value>Row for MsiFileHash table.</value>
-        ////public Row HashRow
-        ////{
-        ////    get { return this.hashRow; }
-        ////    set { this.hashRow = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the set of MsiAssemblyName rows created for this FileRow.
-        /////// </summary>
-        /////// <value>RowCollection of MsiAssemblyName table.</value>
-        ////[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        ////public List<Row> AssemblyNameRows
-        ////{
-        ////    get { return this.assemblyNameRows; }
-        ////    set { this.assemblyNameRows = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the patching attributes to the file.
-        /////// </summary>
-        /////// <value>Patching attributes of the file.</value>
-        ////public PatchAttributeType PatchAttributes
-        ////{
-        ////    get { return this.patchAttributes; }
-        ////    set { this.patchAttributes = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-length list for the file.
-        /////// </summary>
-        /////// <value>RetainLength list for the file.</value>
-        ////public string RetainLengths
-        ////{
-        ////    get { return this.retainLengths; }
-        ////    set { this.retainLengths = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-offset list for the file.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the file.</value>
-        ////public string IgnoreOffsets
-        ////{
-        ////    get { return this.ignoreOffsets; }
-        ////    set { this.ignoreOffsets = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-length list for the file.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the file.</value>
-        ////public string IgnoreLengths
-        ////{
-        ////    get { return this.ignoreLengths; }
-        ////    set { this.ignoreLengths = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-offset list for the file.
-        /////// </summary>
-        /////// <value>RetainOffset list for the file.</value>
-        ////public string RetainOffsets
-        ////{
-        ////    get { return this.retainOffsets; }
-        ////    set { this.retainOffsets = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-length list for the previous file.
-        /////// </summary>
-        /////// <value>RetainLength list for the previous file.</value>
-        ////public string PreviousRetainLengths
-        ////{
-        ////    get { return this.previousRetainLengths[0]; }
-        ////    set { this.previousRetainLengths[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch retain-length list for the previous files.
-        /////// </summary>
-        /////// <value>RetainLength list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousRetainLengthsArray
-        ////{
-        ////    get { return this.previousRetainLengths; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-offset list for the previous file.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the previous file.</value>
-        ////public string PreviousIgnoreOffsets
-        ////{
-        ////    get { return this.previousIgnoreOffsets[0]; }
-        ////    set { this.previousIgnoreOffsets[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch ignore-offset list for the previous files.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousIgnoreOffsetsArray
-        ////{
-        ////    get { return this.previousIgnoreOffsets; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-length list for the previous file.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the previous file.</value>
-        ////public string PreviousIgnoreLengths
-        ////{
-        ////    get { return this.previousIgnoreLengths[0]; }
-        ////    set { this.previousIgnoreLengths[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch ignore-length list for the previous files.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the previous files.</value>
-        ////[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousIgnoreLengthsArray
-        ////{
-        ////    get { return this.previousIgnoreLengths; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-offset list for the previous file.
-        /////// </summary>
-        /////// <value>RetainOffset list for the previous file.</value>
-        ////public string PreviousRetainOffsets
-        ////{
-        ////    get { return this.previousRetainOffsets[0]; }
-        ////    set { this.previousRetainOffsets[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch retain-offset list for the previous files.
-        /////// </summary>
-        /////// <value>RetainOffset list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousRetainOffsetsArray
-        ////{
-        ////    get { return this.previousRetainOffsets; }
-        ////}
-
-        /////// <summary>
-        /////// Compares the current FileRow with another object of the same type.
-        /////// </summary>
-        /////// <param name="obj">An object to compare with this instance.</param>
-        /////// <returns>An integer that indicates the relative order of the comparands.</returns>
-        ////[SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String)")]
-        ////[SuppressMessage("Microsoft.Globalization", "CA1309:UseOrdinalStringComparison")]
-        ////public int CompareTo(object obj)
-        ////{
-        ////    if (this == obj)
-        ////    {
-        ////        return 0;
-        ////    }
-
-        ////    FileRow fileRow = obj as FileRow;
-        ////    if (null == fileRow)
-        ////    {
-        ////        throw new ArgumentException(WixDataStrings.EXP_OtherObjectIsNotFileRow);
-        ////    }
-
-        ////    int compared = this.DiskId - fileRow.DiskId;
-        ////    if (0 == compared)
-        ////    {
-        ////        compared = this.patchGroup - fileRow.patchGroup;
-
-        ////        if (0 == compared)
-        ////        {
-        ////            compared = String.Compare(this.File, fileRow.File, StringComparison.InvariantCulture);
-        ////        }
-        ////    }
-
-        ////    return compared;
-        ////}
-
-        /////// <summary>
-        /////// Copies data from another FileRow object.
-        /////// </summary>
-        /////// <param name="src">An row to get data from.</param>
-        ////public void CopyFrom(FileRow src)
-        ////{
-        ////    for (int i = 0; i < src.Fields.Length; i++)
-        ////    {
-        ////        this[i] = src[i];
-        ////    }
-        ////    this.assemblyManifest = src.assemblyManifest;
-        ////    this.assemblyType = src.assemblyType;
-        ////    this.directory = src.directory;
-        ////    this.diskId = src.diskId;
-        ////    this.fromModule = src.fromModule;
-        ////    this.isGeneratedShortFileName = src.isGeneratedShortFileName;
-        ////    this.patchGroup = src.patchGroup;
-        ////    this.processorArchitecture = src.processorArchitecture;
-        ////    this.source = src.source;
-        ////    this.PreviousSource = src.PreviousSource;
-        ////    this.Operation = src.Operation;
-        ////    this.symbols = src.symbols;
-        ////    this.PreviousSymbols = src.PreviousSymbols;
-        ////    this.patchAttributes = src.patchAttributes;
-        ////    this.retainOffsets = src.retainOffsets;
-        ////    this.retainLengths = src.retainLengths;
-        ////    this.ignoreOffsets = src.ignoreOffsets;
-        ////    this.ignoreLengths = src.ignoreLengths;
-        ////    this.PreviousRetainOffsets = src.PreviousRetainOffsets;
-        ////    this.PreviousRetainLengths = src.PreviousRetainLengths;
-        ////    this.PreviousIgnoreOffsets = src.PreviousIgnoreOffsets;
-        ////    this.PreviousIgnoreLengths = src.PreviousIgnoreLengths;
-        ////}
+        /// <summary>
+        /// Gets or sets the disk id for this file.
+        /// </summary>
+        /// <value>Disk id for the file.</value>
+        public int DiskId
+        {
+            get => this.FieldAsInteger(8);
+            set => this.Fields[8].Data = value;
+        }
 
-        /////// <summary>
-        /////// Appends previous data from another FileRow object.
-        /////// </summary>
-        /////// <param name="src">An row to get data from.</param>
-        ////public void AppendPreviousDataFrom(FileRow src)
-        ////{
-        ////    AppendStringToArray(ref this.previousSource, src.previousSource[0]);
-        ////    AppendStringToArray(ref this.previousSymbols, src.previousSymbols[0]);
-        ////    AppendStringToArray(ref this.previousRetainOffsets, src.previousRetainOffsets[0]);
-        ////    AppendStringToArray(ref this.previousRetainLengths, src.previousRetainLengths[0]);
-        ////    AppendStringToArray(ref this.previousIgnoreOffsets, src.previousIgnoreOffsets[0]);
-        ////    AppendStringToArray(ref this.previousIgnoreLengths, src.previousIgnoreLengths[0]);
-        ////}
+        /// <summary>
+        /// Gets or sets the source location to the file.
+        /// </summary>
+        /// <value>Source location to the file.</value>
+        public string Source
+        {
+            get => this.FieldAsString(9);
+            set => this.Fields[9].Data = value;
+        }
 
-        /////// <summary>
-        /////// Helper method for AppendPreviousDataFrom.
-        /////// </summary>
-        /////// <param name="source">Destination array.</param>
-        /////// <param name="destination">Source string.</param>
-        ////private static void AppendStringToArray(ref string[] destination, string source)
-        ////{
-        ////    string[] result = new string[destination.Length + 1];
-        ////    destination.CopyTo(result, 0);
-        ////    result[destination.Length] = source;
-        ////    destination = result;
-        ////}
+        /// <summary>
+        /// Gets or sets the source location to the previous file.
+        /// </summary>
+        /// <value>Source location to the previous file.</value>
+        public string PreviousSource
+        {
+            get => this.Fields[9].PreviousData;
+            set => this.Fields[9].PreviousData = value;
+        }
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
index 6aae1dd8..e24839c0 100644
--- a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
+++ b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs
@@ -39,15 +39,16 @@ namespace WixToolset.Data.WindowsInstaller
         /// <returns>New SubStorage object.</returns>
         internal static SubStorage Read(XmlReader reader)
         {
-            if (!reader.LocalName.Equals("subStorage" == reader.LocalName))
+            if (reader.LocalName != "subStorage")
             {
                 throw new XmlException();
             }
 
             WindowsInstallerData data = null;
-            bool empty = reader.IsEmptyElement;
             string name = null;
 
+            var empty = reader.IsEmptyElement;
+
             while (reader.MoveToNextAttribute())
             {
                 switch (reader.LocalName)
@@ -60,7 +61,7 @@ namespace WixToolset.Data.WindowsInstaller
 
             if (!empty)
             {
-                bool done = false;
+                var done = false;
 
                 while (!done && reader.Read())
                 {
@@ -76,6 +77,7 @@ namespace WixToolset.Data.WindowsInstaller
                                     throw new XmlException();
                             }
                             break;
+
                         case XmlNodeType.EndElement:
                             done = true;
                             break;
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
index 80303913..96c5f74f 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
@@ -36,18 +36,12 @@ namespace WixToolset.Data.WindowsInstaller
         /// Gets the number of items in the collection.
         /// </summary>
         /// <value>Number of items in collection.</value>
-        public int Count
-        {
-            get { return this.collection.Count; }
-        }
+        public int Count => this.collection.Count;
 
         /// <summary>
         /// Table definition collections are never read-only.
         /// </summary>
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
+        public bool IsReadOnly => false;
 
         /// <summary>
         /// Gets a table definition by name.
@@ -72,10 +66,7 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="tableName">Name of table to locate.</param>
         /// <param name="table">Table definition if found.</param>
         /// <returns>True if table definition was found otherwise false.</returns>
-        public bool TryGet(string tableName, out TableDefinition table)
-        {
-            return this.collection.TryGetValue(tableName, out table);
-        }
+        public bool TryGet(string tableName, out TableDefinition table) => this.collection.TryGetValue(tableName, out table);
 
         /// <summary>
         /// Load a table definition collection from an XmlReader.
@@ -95,76 +86,52 @@ namespace WixToolset.Data.WindowsInstaller
         /// </summary>
         /// <param name="tableDefinition">Table definition to add to the collection.</param>
         /// <value>Indexes by table definition name.</value>
-        public void Add(TableDefinition tableDefinition)
-        {
-            this.collection.Add(tableDefinition.Name, tableDefinition);
-        }
+        public void Add(TableDefinition tableDefinition) => this.collection.Add(tableDefinition.Name, tableDefinition);
 
         /// <summary>
         /// Removes all table definitions from the collection.
         /// </summary>
-        public void Clear()
-        {
-            this.collection.Clear();
-        }
+        public void Clear() => this.collection.Clear();
 
         /// <summary>
         /// Checks if the collection contains a table name.
         /// </summary>
         /// <param name="tableName">The table to check in the collection.</param>
         /// <returns>True if collection contains the table.</returns>
-        public bool Contains(string tableName)
-        {
-            return this.collection.ContainsKey(tableName);
-        }
+        public bool Contains(string tableName) => this.collection.ContainsKey(tableName);
 
         /// <summary>
         /// Checks if the collection contains a table.
         /// </summary>
         /// <param name="table">The table to check in the collection.</param>
         /// <returns>True if collection contains the table.</returns>
-        public bool Contains(TableDefinition table)
-        {
-            return this.collection.ContainsKey(table.Name);
-        }
+        public bool Contains(TableDefinition table) => this.collection.ContainsKey(table.Name);
 
         /// <summary>
         /// Copies table definitions to an arry.
         /// </summary>
         /// <param name="array">Array to copy the table definitions to.</param>
         /// <param name="index">Index in the array to start copying at.</param>
-        public void CopyTo(TableDefinition[] array, int index)
-        {
-            this.collection.Values.CopyTo(array, index);
-        }
+        public void CopyTo(TableDefinition[] array, int index) => this.collection.Values.CopyTo(array, index);
 
         /// <summary>
         /// Removes a table definition from the collection.
         /// </summary>
         /// <param name="table">Table to remove from the collection.</param>
         /// <returns>True if the table definition existed in the collection and was removed.</returns>
-        public bool Remove(TableDefinition table)
-        {
-            return this.collection.Remove(table.Name);
-        }
+        public bool Remove(TableDefinition table) => this.collection.Remove(table.Name);
 
         /// <summary>
         /// Gets enumerator for the collection.
         /// </summary>
         /// <returns>Enumerator for the collection.</returns>
-        public IEnumerator<TableDefinition> GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
+        public IEnumerator<TableDefinition> GetEnumerator() => this.collection.Values.GetEnumerator();
 
         /// <summary>
         /// Gets the untyped enumerator for the collection.
         /// </summary>
         /// <returns>Untyped enumerator for the collection.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => this.collection.Values.GetEnumerator();
 
         /// <summary>
         /// Loads a collection of table definitions from a XmlReader in memory.
@@ -178,8 +145,8 @@ namespace WixToolset.Data.WindowsInstaller
                 throw new XmlException();
             }
 
-            bool empty = reader.IsEmptyElement;
-            TableDefinitionCollection tableDefinitionCollection = new TableDefinitionCollection();
+            var empty = reader.IsEmptyElement;
+            var tableDefinitionCollection = new TableDefinitionCollection();
 
             while (reader.MoveToNextAttribute())
             {
@@ -188,7 +155,7 @@ namespace WixToolset.Data.WindowsInstaller
             // parse the child elements
             if (!empty)
             {
-                bool done = false;
+                var done = false;
 
                 while (!done && reader.Read())
                 {
diff --git a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
index 57ba19d1..a399c6fa 100644
--- a/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
+++ b/src/WixToolset.Data/WindowsInstaller/TableIndexedCollection.cs
@@ -15,19 +15,13 @@ namespace WixToolset.Data.WindowsInstaller
         /// <summary>
         /// Instantiate a new empty collection.
         /// </summary>
-        public TableIndexedCollection()
-        {
-            this.collection = new Dictionary<string, Table>();
-        }
+        public TableIndexedCollection() => this.collection = new Dictionary<string, Table>();
 
         /// <summary>
         /// Instantiate a new collection populated with a set of tables.
         /// </summary>
         /// <param name="tables">Set of tables.</param>
-        public TableIndexedCollection(IEnumerable<Table> tables)
-        {
-            this.collection = tables.ToDictionary(t => t.Name);
-        }
+        public TableIndexedCollection(IEnumerable<Table> tables) => this.collection = tables.ToDictionary(t => t.Name);
 
         /// <summary>
         /// Gets the number of items in the collection.
@@ -45,18 +39,12 @@ namespace WixToolset.Data.WindowsInstaller
         /// </summary>
         /// <param name="table">Table to add to the collection.</param>
         /// <remarks>Indexes the table by name.</remarks>
-        public void Add(Table table)
-        {
-            this.collection.Add(table.Name, table);
-        }
+        public void Add(Table table) => this.collection.Add(table.Name, table);
 
         /// <summary>
         /// Clear the tables from the collection.
         /// </summary>
-        public void Clear()
-        {
-            this.collection.Clear();
-        }
+        public void Clear() => this.collection.Clear();
 
         /// <summary>
         /// Determines if a table is in the collection.
@@ -70,46 +58,31 @@ namespace WixToolset.Data.WindowsInstaller
         /// </summary>
         /// <param name="array">Array to copy the collection into.</param>
         /// <param name="arrayIndex">Index to start copying from.</param>
-        public void CopyTo(Table[] array, int arrayIndex)
-        {
-            this.collection.Values.CopyTo(array, arrayIndex);
-        }
+        public void CopyTo(Table[] array, int arrayIndex) => this.collection.Values.CopyTo(array, arrayIndex);
 
         /// <summary>
         /// Remove a table from the collection by name.
         /// </summary>
         /// <param name="tableName">Table name to remove from the collection.</param>
-        public void Remove(string tableName)
-        {
-            this.collection.Remove(tableName);
-        }
+        public void Remove(string tableName) => _ = this.collection.Remove(tableName);
 
         /// <summary>
         /// Remove a table from the collection.
         /// </summary>
         /// <param name="table">Table with matching name to remove from the collection.</param>
-        public bool Remove(Table table)
-        {
-            return this.collection.Remove(table.Name);
-        }
+        public bool Remove(Table table) => this.collection.Remove(table.Name);
 
         /// <summary>
         /// Gets an enumerator over the whole collection.
         /// </summary>
         /// <returns>Collection enumerator.</returns>
-        public IEnumerator<Table> GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
+        public IEnumerator<Table> GetEnumerator() => this.collection.Values.GetEnumerator();
 
         /// <summary>
         /// Gets an untyped enumerator over the whole collection.
         /// </summary>
         /// <returns>Untyped collection enumerator.</returns>
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => this.collection.Values.GetEnumerator();
 
         /// <summary>
         /// Gets a table by name.
@@ -117,16 +90,8 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="tableName">Name of table to locate.</param>
         public Table this[string tableName]
         {
-            get
-            {
-                Table table;
-                return this.collection.TryGetValue(tableName, out table) ? table : null;
-            }
-
-            set
-            {
-                this.collection[tableName] = value;
-            }
+            get => this.collection.TryGetValue(tableName, out var table) ? table : null;
+            set => this.collection[tableName] = value;
         }
 
         /// <summary>
@@ -135,9 +100,6 @@ namespace WixToolset.Data.WindowsInstaller
         /// <param name="tableName">Table name to locate.</param>
         /// <param name="table">Found table.</param>
         /// <returns>True if table with table name was found, otherwise false.</returns>
-        public bool TryGetTable(string tableName, out Table table)
-        {
-            return this.collection.TryGetValue(tableName, out table);
-        }
+        public bool TryGetTable(string tableName, out Table table) => this.collection.TryGetValue(tableName, out table);
     }
 }
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index 0855997c..ac593152 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -61,6 +61,42 @@ namespace WixToolset.Data.WindowsInstaller
         public TableIndexedCollection Tables { get; private set; }
 
         /// <summary>
+        /// Ensure this output contains a particular table.
+        /// </summary>
+        /// <param name="tableDefinition">Definition of the table that should exist.</param>
+        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
+        /// <returns>The table in this output.</returns>
+        public Table EnsureTable(TableDefinition tableDefinition)
+        {
+            if (!this.Tables.TryGetTable(tableDefinition.Name, out var table))
+            {
+                table = new Table(tableDefinition);
+                this.Tables.Add(table);
+            }
+
+            return table;
+        }
+
+        /// <summary>
+        /// Saves an output to a <c>WixOutput</c> container.
+        /// </summary>
+        /// <param name="wixout">Container to save to.</param>
+        public void Save(WixOutput wixout)
+        {
+            using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName)))
+            {
+                writer.WriteStartDocument();
+                this.Write(writer);
+                writer.WriteEndDocument();
+            }
+        }
+
+        /// <summary>
+        /// Gets table by name.
+        /// </summary>
+        public bool TryGetTable(string tableName, out Table table) => this.Tables.TryGetTable(tableName, out table);
+
+        /// <summary>
         /// Loads an output from a path on disk.
         /// </summary>
         /// <param name="path">Path to output file saved on disk.</param>
@@ -85,20 +121,6 @@ namespace WixToolset.Data.WindowsInstaller
         }
 
         /// <summary>
-        /// Saves an output to a <c>WixOutput</c> container.
-        /// </summary>
-        /// <param name="wixout">Container to save to.</param>
-        public void Save(WixOutput wixout)
-        {
-            using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName)))
-            {
-                writer.WriteStartDocument();
-                this.Write(writer);
-                writer.WriteEndDocument();
-            }
-        }
-
-        /// <summary>
         /// Processes an XmlReader and builds up the output object.
         /// </summary>
         /// <param name="reader">Reader to get data from.</param>
@@ -207,23 +229,6 @@ namespace WixToolset.Data.WindowsInstaller
         }
 
         /// <summary>
-        /// Ensure this output contains a particular table.
-        /// </summary>
-        /// <param name="tableDefinition">Definition of the table that should exist.</param>
-        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
-        /// <returns>The table in this output.</returns>
-        public Table EnsureTable(TableDefinition tableDefinition)
-        {
-            if (!this.Tables.TryGetTable(tableDefinition.Name, out var table))
-            {
-                table = new Table(tableDefinition);
-                this.Tables.Add(table);
-            }
-
-            return table;
-        }
-
-        /// <summary>
         /// Persists an output in an XML format.
         /// </summary>
         /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>