diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
index 2ccfb74..1f62600 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
@@ -18,13 +18,6 @@
 class EditorManager extends DefaultPluginManager {
 
   /**
-   * The module handler to invoke hooks on.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
    * Constructs an EditorManager object.
    *
    * @param \Traversable $namespaces
@@ -41,7 +34,6 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
     parent::__construct('Plugin/Editor', $namespaces, 'Drupal\editor\Annotation\Editor');
     $this->alterInfo($module_handler, 'editor_info');
     $this->setCacheBackend($cache_backend, $language_manager, 'editor_plugins');
-    $this->moduleHandler = $module_handler;
   }
 
   /**
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 06ffdae..b33e169 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -26,14 +26,14 @@ class DisplayOverview extends DisplayOverviewBase {
   protected $displayContext = 'view';
   
   /**
-   * Stores a module manager to invoke hooks.
+   * Stores the module manager.
    *
    * @var \Drupal\Core\Extension\ModuleHandlerInterface
    */
   protected $moduleHandler;
 
   /**
-   * Constructs a new DisplayOverview.
+   * Constructs a new class instance.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
index 5d15ad0..b746a5e 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
@@ -26,14 +26,14 @@ class FormDisplayOverview extends DisplayOverviewBase {
   protected $displayContext = 'form';
 
   /**
-   * Stores a module manager to invoke hooks.
+   * Stores the module manager.
    *
    * @var \Drupal\Core\Extension\ModuleHandlerInterface
    */
   protected $moduleHandler;
 
   /**
-   * Constructs a new FormDisplayOverview.
+   * Constructs a new class instance.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
@@ -42,7 +42,7 @@ class FormDisplayOverview extends DisplayOverviewBase {
    * @param \Drupal\Component\Plugin\PluginManagerBase $plugin_manager
    *   The widget or formatter plugin manager.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler class to use for invoking hooks.
+   *   The module handler to use for invoking hooks.
    */
   public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManager $field_type_manager, PluginManagerBase $plugin_manager, ModuleHandlerInterface $module_handler) {
     parent::__construct($entity_manager, $field_type_manager, $plugin_manager);
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index b5449ec..7a92caf 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -81,8 +81,9 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
 /**
  * Implements hook_TYPE_alter() on behalf of block module.
  *
- * This is for verifying that \Drupal::moduleHandler()->alter(array(TYPE1, TYPE2), ...)
- * allows hook_module_implements_alter() to affect the order in which module
+ * This is to verify that
+ * \Drupal::moduleHandler()->alter(array(TYPE1, TYPE2), ...) allows
+ * hook_module_implements_alter() to affect the order in which module
  * implementations are executed.
  */
 function block_drupal_alter_foo_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
@@ -95,10 +96,11 @@ function block_drupal_alter_foo_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
  * @see block_drupal_alter_foo_alter()
  */
 function common_test_module_implements_alter(&$implementations, $hook) {
-  // For \Drupal::moduleHandler()->alter(array('drupal_alter', 'drupal_alter_foo'), ...),
+  // For
+  // \Drupal::moduleHandler()->alter(array('drupal_alter', 'drupal_alter_foo'), ...),
   // make the block module implementations run after all the other modules. Note
-  // that when \Drupal::moduleHandler->alter() is called with an array of types, the
-  // first type is considered primary and controls the module order.
+  // that when \Drupal::moduleHandler->alter() is called with an array of types,
+  // the first type is considered primary and controls the module order.
   if ($hook == 'drupal_alter_alter' && isset($implementations['block'])) {
     $group = $implementations['block'];
     unset($implementations['block']);