diff --git a/Perspex.Base/PerspexObject.cs b/Perspex.Base/PerspexObject.cs
index f585e481d1..8845ed1790 100644
--- a/Perspex.Base/PerspexObject.cs
+++ b/Perspex.Base/PerspexObject.cs
@@ -446,14 +446,11 @@ namespace Perspex
         /// <summary>
         /// Gets all of the <see cref="PerspexProperty"/> values explicitly set on this object.
         /// </summary>
-        public IEnumerable<Tuple<PerspexProperty, object, BindingPriority>> GetSetValues()
+        public IEnumerable<PerspexPropertyValue> GetSetValues()
         {
             foreach (var value in this.values)
             {
-                yield return Tuple.Create(
-                    value.Key,
-                    value.Value.Value,
-                    (BindingPriority)value.Value.ValuePriority);
+                yield return new PerspexPropertyValue(value.Key, value.Value);
             }
         }
 
diff --git a/Perspex.Diagnostics/Debug.cs b/Perspex.Diagnostics/Debug.cs
index bc3330b286..80bb82c3e8 100644
--- a/Perspex.Diagnostics/Debug.cs
+++ b/Perspex.Diagnostics/Debug.cs
@@ -44,11 +44,11 @@ namespace Perspex.Diagnostics
                 {
                     builder.Append(Indent(indent));
                     builder.Append(" |  ");
-                    builder.Append(value.Item1.Name);
+                    builder.Append(value.Property.Name);
                     builder.Append(" = ");
-                    builder.Append(value.Item2 ?? "(null)");
+                    builder.Append(value.CurrentValue ?? "(null)");
                     builder.Append(" [");
-                    builder.Append(value.Item3);
+                    builder.Append(value.PriorityValue.ValuePriority);
                     builder.AppendLine("]");
                 }
             }