Joseph Olstad
--- a/src/Entity/Message.php
+++ b/src/Entity/Message.php
    ];

    foreach ($output as $key => $value) {
-      $output[$key] = \Drupal::token()
-        ->replace($value, ['message' => $this], $options);
+      // Make sure $value is still a Markup objet by creating it explicitly, as
+      // function token replace will return a string if the token was replaced.
+      // If returned value is already an object that implements MarkupInterface
+      // it is returned unchanged. See create($string) in MarkupTrait.php.
-      // Make sure $value is still a Markup objet by creating it explicitly, as
-      // function token replace will return a string if the token was replaced.
-      // If returned value is already an object that implements MarkupInterface
-      // it is returned unchanged. See create($string) in MarkupTrait.php.
+      // Make sure $value is still a Markup object by creating it explicitly, as
+      // the token replace method will return a string if the token was replaced.
+      // If the returned value is already an object that implements MarkupInterface
+      // it is returned unchanged. See: \Drupal\Component\Render\MarkupTrait::create.