diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php
index 8091aa8..aa93124 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php
@@ -94,7 +94,6 @@ public function view(EntityInterface $entity, $langcode, FieldInterface $items)
         '#entity_type' => $entity_type,
         '#bundle' => $entity->bundle(),
         '#object' => $entity,
-        // @todo Anything that uses #items should be converted as well...
         '#items' => $items->getValue(TRUE),
         '#formatter' => $this->getPluginId(),
       );
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
index acafdfd..7b4ed79 100644
--- a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
+++ b/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
@@ -133,15 +133,11 @@ public function prepareView(array $entities, $langcode, array $items) {
 
         // Add optional 'rel' attribute to link options.
         if (!empty($settings['rel'])) {
-          $options = $item->options;
-          $options['attributes']['rel'] = $settings['rel'];
-          $item->options = $options;
+          $item->options['attributes']['rel'] = $settings['rel'];
         }
         // Add optional 'target' attribute to link options.
         if (!empty($settings['target'])) {
-          $options = $item->options;
-          $options['attributes']['target'] = $settings['target'];
-          $item->options = $options;
+          $item->options['attributes']['target'] = $settings['target'];
         }
       }
     }
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
index 429b468..2de5aac 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
@@ -39,8 +39,8 @@ public function viewElements(EntityInterface $entity, $langcode, FieldInterface
     $elements = array();
 
     foreach ($items as $delta => $item) {
-      // @todo Convert text_sanitize() to work on an NG $item (this requires
-      //   http://drupal.org/node/1969728.)
+      // @todo Convert text_sanitize() to work on an NG $item. See
+      // https://drupal.org/node/2026339.
       $itemBC = $item->getValue(TRUE);
       $output = text_sanitize($this->getFieldSetting('text_processing'), $langcode, $itemBC, 'value');
       $elements[$delta] = array('#markup' => $output);