diff --git a/src/spectator/formatting/failure_block.cr b/src/spectator/formatting/failure_block.cr
index 4b7276e..b542775 100644
--- a/src/spectator/formatting/failure_block.cr
+++ b/src/spectator/formatting/failure_block.cr
@@ -53,7 +53,7 @@ module Spectator::Formatting
     # Produces a list of unsatisfied expectations and their values.
     private def unsatisfied_expectations(indent)
       @result.expectations.each_unsatisfied do |expectation|
-        indent.line(Color.failure(LabeledText.new("Failure", expectation.actual_message)))
+        indent.line(Color.failure(LabeledText.new("Failure", expectation.failure_message)))
         indent.line
         indent.increase do
           matcher_values(indent, expectation)
diff --git a/src/spectator/formatting/failure_junit_test_case.cr b/src/spectator/formatting/failure_junit_test_case.cr
index d2f9d2d..964e673 100644
--- a/src/spectator/formatting/failure_junit_test_case.cr
+++ b/src/spectator/formatting/failure_junit_test_case.cr
@@ -19,7 +19,7 @@ module Spectator::Formatting
     private def content(xml)
       super
       @result.expectations.each_unsatisfied do |expectation|
-        xml.element("failure", message: expectation.actual_message) do
+        xml.element("failure", message: expectation.failure_message) do
           expectation_values(expectation.values, xml)
         end
       end
@@ -28,8 +28,8 @@ module Spectator::Formatting
     # Adds the expectation values to the failure block.
     private def expectation_values(labeled_values, xml)
       labeled_values.each do |entry|
-        label = entry.label
-        value = entry.value
+        label = entry.first
+        value = entry.last
         xml.text("#{label}: #{value}\n")
       end
     end
diff --git a/src/spectator/formatting/match_data_values.cr b/src/spectator/formatting/match_data_values.cr
index 51b5f1e..bf194a9 100644
--- a/src/spectator/formatting/match_data_values.cr
+++ b/src/spectator/formatting/match_data_values.cr
@@ -2,22 +2,22 @@ module Spectator::Formatting
   # Produces a `MatchDataValuePair` for each key-value pair
   # from `Spectator::Matchers::MatchData#values`.
   private struct MatchDataValues
-    include Enumerable(MatchDataValuePair)
+    include Enumerable(Tuple(Symbol, String))
 
     @max_key_length : Int32
 
     # Creates the values mapper.
-    def initialize(@values : Array(Spectator::Matchers::MatchDataLabeledValue))
-      @max_key_length = @values.map(&.label.to_s.size).max
+    def initialize(@values : Array(Tuple(Symbol, String)))
+      @max_key_length = @values.map(&.first.to_s.size).max
     end
 
     # Yields pairs that can be printed to output.
     def each
       @values.each do |labeled_value|
-        key = labeled_value.label
+        key = labeled_value.first
         key_length = key.to_s.size
         padding = @max_key_length - key_length
-        yield MatchDataValuePair.new(key, labeled_value.value, padding)
+        yield MatchDataValuePair.new(key, labeled_value.last, padding)
       end
     end
   end