diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris
index b41e796..5fa6a3b 160000
--- a/libs/MicrosoftIris
+++ b/libs/MicrosoftIris
@@ -1 +1 @@
-Subproject commit b41e796c46ff8bc87d9469f8f826cbda83c26de8
+Subproject commit 5fa6a3b202afa04dc45bfb1a023bc25e8082195d
diff --git a/libs/UIX.Asm/Disassembler.cs b/libs/UIX.Asm/Disassembler.cs
index 7cb1639..efdb6d1 100644
--- a/libs/UIX.Asm/Disassembler.cs
+++ b/libs/UIX.Asm/Disassembler.cs
@@ -323,29 +323,49 @@ public class Disassembler
     {
         var qualifiedTypeName = GetQualifiedName(typeSchema);
 
-        // String encodable
+        // ILayout has a number of derived classes with special named instacnes,
+        // but aren't implemented as canonical instances.
+        if (constantValue is Layout.ILayout constantLayout && Layout.PredefinedLayouts.TryConvertToString(constantLayout, out var constantLayoutString))
+        {
+            qualifiedTypeName = GetQualifiedName(UIXTypes.MapIDToType(UIXTypeID.Layout));
+            return new StringEncodedConstantDirective(constantName, qualifiedTypeName, constantLayoutString);
+        }
+
+        // Instance may be canonical and can be encoded using its name
+        if (constantValue is IHasCanonicalInstances maybeCanonicalValue)
+        {
+            // Attempt to get the canonical name for this instance.
+            // If there isn't one, then fall back to other methods.
+            var canonicalName = maybeCanonicalValue.GetCanonicalName();
+            if (canonicalName is not null)
+                return new CanonicalInstanceConstantDirective(constantName, qualifiedTypeName, canonicalName);
+        }
+
+        // Type supports canonical instances
+        if (typeSchema.SupportsCanonicalInstance && constantValue is string maybeCanonicalName)
+        {
+            // Attempt to get the canonical instance with this name.
+            // If there isn't one, then fall back to the other methods.
+            var canonicalInstance = typeSchema.FindCanonicalInstance(maybeCanonicalName);
+            if (canonicalInstance is not null)
+                return new CanonicalInstanceConstantDirective(constantName, qualifiedTypeName, maybeCanonicalName);
+        }
+        
+        // Instance is explicitly encodable as a string
         if (constantValue is IStringEncodable encodable)
         {
             var encodedValue = encodable.EncodeString();
             return new StringEncodedConstantDirective(constantName, qualifiedTypeName, encodedValue);
         }
 
-        // TODO: How are canonical instances usually handled? Are they always loaded by
-        // converting the canonical name as a string to the base type?
-        // Custom handling for ILayout
-        if (constantValue is Layout.ILayout constantLayout && Layout.PredefinedLayouts.TryConvertToString(constantLayout, out var constantLayoutString))
-        {
-            qualifiedTypeName = GetQualifiedName(UIXTypes.MapIDToType(UIXTypeID.Layout));
-            return new CanonicalInstanceConstantDirective(constantName, qualifiedTypeName, constantLayoutString);
-        }
-
+        // Type supports parsing from string, implicitly encodable as a string
         if (typeSchema.SupportsTypeConversion(_stringTypeSchema))
         {
             var encodedValue = constantValue.ToString();
             return new StringEncodedConstantDirective(constantName, qualifiedTypeName, encodedValue);
         }
 
-        // Binary encodable
+        // Type supports encoding as raw bytes
         if (typeSchema.SupportsBinaryEncoding)
         {
             ByteCodeWriter writer = new();
@@ -359,44 +379,6 @@ public class Disassembler
             return new BinaryEncodedConstantDirective(constantName, qualifiedTypeName, encodedBytes);
         }
 
-#if DEBUG
         throw new NotSupportedException($"Unable to encode constant value '{constantValue}' of type '{qualifiedTypeName}'");
-#else
-        XName constElemName = qualifiedTypeName.NamespacePrefix is null
-            ? qualifiedTypeName.TypeName
-            : XName.Get(qualifiedTypeName.TypeName, qualifiedTypeName.NamespacePrefix);
-        XElement constElem = new(constElemName);
-
-        var defaultConstantValue = typeSchema.ConstructDefault();
-
-        foreach (var prop in typeSchema.Properties)
-        {
-            // No need to serialize properties that can't be set
-            if (!prop.CanWrite)
-                continue;
-
-            var defaultPropValue = prop.GetValue(defaultConstantValue);
-            var propValue = prop.GetValue(constantValue);
-
-            var encodedPropValue = EncodeSimpleConstant(propValue);
-            var encodedDefaultPropValue = EncodeSimpleConstant(defaultPropValue);
-
-            // No need to serialize properties that are at their default value
-            if (encodedPropValue == encodedDefaultPropValue)
-                continue;
-
-            constElem.SetAttributeValue(prop.Name, encodedPropValue);
-        }
-
-        var constructor = constElem.ToString(SaveOptions.DisableFormatting);
-        return new ConstantDirective(constantName, qualifiedTypeName, constructor);
-#endif
-    }
-
-    private static string EncodeSimpleConstant(object value)
-    {
-        return value is IStringEncodable encodable
-            ? encodable.EncodeString()
-            : value.ToString();
     }
 }
diff --git a/libs/UIX.Test/Assembly.cs b/libs/UIX.Test/Assembly.cs
index bbc0967..625a5b2 100644
--- a/libs/UIX.Test/Assembly.cs
+++ b/libs/UIX.Test/Assembly.cs
@@ -108,6 +108,7 @@ Alt_locl:
             OutputFileName = uibPathAc
         };
 
+        _output.WriteLine($"Disassembly: {uixaPath}");
         _output.WriteLine($"Expected: {uibFile.Path}");
         _output.WriteLine($"Actual: {compilerInput.OutputFileName}");
 
diff --git a/libs/UIX.Test/Resources/text.uix b/libs/UIX.Test/Resources/text.uix
index 2317b8c..56ffb82 100644
--- a/libs/UIX.Test/Resources/text.uix
+++ b/libs/UIX.Test/Resources/text.uix
@@ -62,4 +62,18 @@
         </Content>
     </UI>
 
+	<UI Name="AligningContent">
+		<!-- This UI provides an example of docking a panel with text to the bottom of a window. -->
+		<Content>
+			<Panel Margins="10">
+				<Layout>
+					<DockLayout DefaultLayoutInput="Bottom"/>
+				</Layout>
+				<Children>
+					<Text Content="This text is at the bottom of the panel."/>
+				</Children>
+			</Panel>
+		</Content>
+	</UI>
+
 </UIX>
\ No newline at end of file