3 files changed, 53 insertions, 29 deletions

diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
index fcc2b1f6..522e3b84 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/TableDefinitionCollection.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Data.WindowsInstaller
     {
         public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wi/tables";
 
-        private Dictionary<string, TableDefinition> collection;
+        private readonly Dictionary<string, TableDefinition> collection;
 
         /// <summary>
         /// Instantiate a new TableDefinitionCollection class.
@@ -74,59 +74,86 @@ 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) => this.collection.TryGetValue(tableName, out table);
+        public bool TryGet(string tableName, out TableDefinition table)
+        {
+            return this.collection.TryGetValue(tableName, out table);
+        }
 
         /// <summary>
         /// Adds a table definition to the collection.
         /// </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) => this.collection.ContainsKey(tableName);
+        public bool Contains(string tableName)
+        {
+            return 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) => this.collection.ContainsKey(table.Name);
+        public bool Contains(TableDefinition table)
+        {
+            return 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) => this.collection.Remove(table.Name);
+        public bool Remove(TableDefinition table)
+        {
+            return this.collection.Remove(table.Name);
+        }
 
         /// <summary>
         /// Gets enumerator for the collection.
         /// </summary>
         /// <returns>Enumerator for the collection.</returns>
-        public IEnumerator<TableDefinition> GetEnumerator() => this.collection.Values.GetEnumerator();
+        public IEnumerator<TableDefinition> GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
 
         /// <summary>
         /// Gets the untyped enumerator for the collection.
         /// </summary>
         /// <returns>Untyped enumerator for the collection.</returns>
-        IEnumerator IEnumerable.GetEnumerator() => this.collection.Values.GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.collection.Values.GetEnumerator();
+        }
 
         /// <summary>
         /// Loads a collection of table definitions from a XmlReader in memory.
diff --git a/src/wix/WixToolset.Core/Compiler_Tag.cs b/src/wix/WixToolset.Core/Compiler_Tag.cs
index 64341808..dfb14c5d 100644
--- a/src/wix/WixToolset.Core/Compiler_Tag.cs
+++ b/src/wix/WixToolset.Core/Compiler_Tag.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// Compiler of the WiX toolset.
@@ -248,7 +249,7 @@ namespace WixToolset.Core
                 }
                 this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, null, ComplexReferenceChildType.Component, id.Id, true);
 
-                this.Core.EnsureTable(sourceLineNumbers, "SoftwareIdentificationTag");
+                this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.SoftwareIdentificationTag);
                 this.Core.AddSymbol(new WixPackageTagSymbol(sourceLineNumbers, id)
                 {
                     FileRef = id.Id,
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs b/src/wix/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
index a2486130..651cd7e6 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
@@ -33,31 +33,27 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             // First, look in the built-ins.
             symbolDefinition = SymbolDefinitions.ByName(name);
-
-            if (symbolDefinition == null)
+            if (symbolDefinition != null)
             {
-                if (this.ExtensionData == null)
-                {
-                    this.LoadExtensionData();
-                }
+                return true;
+            }
 
-                // Second, look in the extensions.
-                foreach (var data in this.ExtensionData)
-                {
-                    if (data.TryGetSymbolDefinitionByName(name, out symbolDefinition))
-                    {
-                        break;
-                    }
-                }
+            if (this.ExtensionData == null)
+            {
+                this.LoadExtensionData();
+            }
 
-                // Finally, look in the custom symbol definitions provided during an intermediate load.
-                if (symbolDefinition == null)
+            // Second, look in the extensions.
+            foreach (var data in this.ExtensionData)
+            {
+                if (data.TryGetSymbolDefinitionByName(name, out symbolDefinition))
                 {
-                    this.CustomDefinitionByName.TryGetValue(name, out symbolDefinition);
+                    return true;
                 }
             }
 
-            return symbolDefinition != null;
+            // Finally, look in the custom symbol definitions provided during an intermediate load.
+            return this.CustomDefinitionByName.TryGetValue(name, out symbolDefinition);
         }
 
         private void LoadExtensionData()