diff --git a/core/lib/Drupal/Core/Entity/Annotation/DisplayComponent.php b/core/lib/Drupal/Core/Entity/Annotation/DisplayComponent.php
index e2178c2..9bd4328 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/DisplayComponent.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/DisplayComponent.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\Annotation\DisplayComponent.
- */
-
 namespace Drupal\Core\Entity\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
diff --git a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerBase.php b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerBase.php
index a31d9e6..2e79113 100644
--- a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerBase.php
+++ b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerBase.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\DisplayComponentHandlerBase.
- */
-
 namespace Drupal\Core\Entity;
 
 use Drupal\Component\Plugin\PluginBase;
diff --git a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerInterface.php b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerInterface.php
index fcb886d..50be9ec 100644
--- a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerInterface.php
+++ b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\DisplayComponentHandlerInterface.
- */
-
 namespace Drupal\Core\Entity;
 
 /**
diff --git a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
index 35bad18..527bb9e 100644
--- a/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
+++ b/core/lib/Drupal/Core/Entity/DisplayComponentHandlerPluginManager.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\DisplayComponentHandlerPluginManager.
- */
-
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Cache\CacheBackendInterface;
diff --git a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
index b12977d..b6d51d1 100644
--- a/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
+++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
@@ -258,6 +258,7 @@ public function buildMultiple(array $entities) {
           }
           $build_list[$id][$name] = $field_access->isAllowed() ? $formatter->view($items, $view_langcode) : [];
 
+          // Apply the field access cacheability metadata to the render array.
           $this->renderer->addCacheableDependency($build_list[$id][$name], $field_access);
         }
       }
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index 1611a05..9f82679 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -353,7 +353,6 @@ public function setComponent($name, array $options = array()) {
     }
 
     // Ensure we always have an empty settings and array.
-    // @TODO, is this the right place to ensure label is set?
     $options += ['settings' => [], 'third_party_settings' => []];
 
     $this->content[$name] = $options;
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/ExtraFieldDisplayComponentHandler.php b/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/ExtraFieldDisplayComponentHandler.php
index 6db98e4..755e377 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/ExtraFieldDisplayComponentHandler.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/ExtraFieldDisplayComponentHandler.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\Plugin\DisplayComponent\ExtraFieldDisplayComponentHandler.
- */
-
 namespace Drupal\Core\Entity\Plugin\DisplayComponent;
 
 use Drupal\Core\Entity\DisplayComponentHandlerBase;
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/FieldDisplayComponentHandler.php b/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/FieldDisplayComponentHandler.php
index 0b51039..15f821a 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/FieldDisplayComponentHandler.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DisplayComponent/FieldDisplayComponentHandler.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Entity\Plugin\DisplayComponent\FieldDisplayComponentHandler.
- */
-
 namespace Drupal\Core\Entity\Plugin\DisplayComponent;
 
 use Drupal\Core\Entity\EntityManagerInterface;
diff --git a/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
index 42c9c03..948f64d 100644
--- a/core/lib/Drupal/Core/Field/FormatterPluginManager.php
+++ b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
@@ -59,6 +59,7 @@ public function createInstance($plugin_id, array $configuration = array()) {
     // @TODO, is this missing somewhere else?
     if (empty($configuration['label'])) {
       $configuration['label'] = '';
+      assert(FALSE, sprintf('The %s does not have a label', $plugin_id));
     }
 
     // @todo This is copied from \Drupal\Core\Plugin\Factory\ContainerFactory.