diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 7d0fec2..9374826 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -949,9 +949,8 @@ function drupal_static_reset($name = NULL) {
  * Formats text for emphasized display in a placeholder inside a sentence.
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. Use
- *   \Drupal\Component\Utility\SafeMarkup::format() with a %variable in an
- *   associative array of replacements, or the "placeholder" filter in Twig
- *   templates instead. Note this method should not be used to only emphasize a
+ *   \Drupal\Component\Utility\SafeMarkup::format() or Twig's "placeholder"
+ *   filter instead. Note this method should not be used to simply emphasize a
  *   string and therefore has few valid use-cases. Note also, that this method
  *   does not mark the string as safe.
  *
diff --git a/core/modules/filter/src/FilterFormatListBuilder.php b/core/modules/filter/src/FilterFormatListBuilder.php
index f84558e..89b4c96 100644
--- a/core/modules/filter/src/FilterFormatListBuilder.php
+++ b/core/modules/filter/src/FilterFormatListBuilder.php
@@ -7,14 +7,12 @@
 
 namespace Drupal\filter;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\Entity\DraggableListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Template\Attribute;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -105,8 +103,9 @@ public function buildRow(EntityInterface $entity) {
       else {
         $roles_markup = $this->t('This format is shown when no other formats are available');
       }
-      // Emphasize the fallback roles text since it is not a role and is
-      // important to understand when configuring filter formats.
+      // Emphasize the fallback role text since it is important to understand
+      // how it works which configuring filter formats. Additionally, it is not
+      // a list of roles unlike the other values in this column.
       $row['roles']['#prefix'] = '<em>';
       $row['roles']['#suffix'] = '</em>';
     }
diff --git a/core/modules/filter/src/FilterPermissions.php b/core/modules/filter/src/FilterPermissions.php
index 9a5ad66..1055fde 100644
--- a/core/modules/filter/src/FilterPermissions.php
+++ b/core/modules/filter/src/FilterPermissions.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\filter;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index 3f2192d..8d40d01 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\node\Controller;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Datetime\DateFormatter;
diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc
index 03f399d..8135003 100644
--- a/core/modules/update/update.report.inc
+++ b/core/modules/update/update.report.inc
@@ -228,7 +228,11 @@ function template_preprocess_update_project_status(&$variables) {
       $extra_item = array();
       $extra_item['attributes'] = new Attribute();
       $extra_item['label'] = $value['label'];
-      $extra_item['data'] = ['#prefix' => '<em>', '#markup' => $value['data'], '#suffix' => '</em>'];
+      $extra_item['data'] = [
+        '#prefix' => '<em>',
+        '#markup' => $value['data'],
+        '#suffix' => '</em>'
+      ];
       $variables['extras'][] = $extra_item;
     }
   }