diff --git a/core/modules/system/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php
index 6799708..65ceec1 100644
--- a/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -122,8 +122,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['uninstall'] = [
       '#type' => 'table',
       '#header' => [
-        'title' => ['data' => $this->t('Name')],
-        'description' => ['data' => $this->t('Description')],
+        'title' => $this->t('Name'),
+        'description' => $this->t('Description'),
       ],
       '#empty' => $this->t('There are no items available to uninstall.'),
       '#tableselect' => TRUE,
@@ -166,7 +166,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
           'To uninstall @module, the following module must be uninstalled first: @required_modules',
           'To uninstall @module, the following modules must be uninstalled first: @required_modules',
           array('@module' => $module->getName(), '@required_modules' => SafeMarkup::checkAdminXss(implode(', ', $required_modules))));
-        $disabled_message = '<div class="admin-requirements">' . $disabled_message . '</div>';
+        $disabled_message = SafeMarkup::format('<div class="admin-requirements">@disabled_message</div>', ['@disabled_message' => $disabled_message]);
       }
       else {
         $disabled_message = '';
@@ -176,10 +176,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
           'The following reason prevents @module from being uninstalled: @reasons',
           'The following reasons prevent @module from being uninstalled: @reasons',
           array('@module' => $module->getName(), '@reasons' => SafeMarkup::checkAdminXss(implode('; ', $validation_reasons[$module_key]))));
-        $disabled_message = '<div class="validation-reasons">' . $disabled_message . '</div>';
+        $disabled_message = SafeMarkup::format('<div class="validation-reasons">@disabled_message</div>', ['@disabled_message' => $disabled_message]);
       }
 
-      $form['uninstall'][$module->getName()]['description']['uninstall']['#markup'] = $this->t($disabled_message);
+      $form['uninstall'][$module->getName()]['description']['uninstall']['#markup'] = $disabled_message;
     }
 
     $form['#attached']['library'][] = 'system/drupal.system.modules';