diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index cb82081..9f4fb59 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -90,7 +90,6 @@ public function execute() {
    * This output is returned as an array.
    */
   public function optionsSummary(&$categories, &$options) {
-    // It is very important to call the parent function here:
     parent::optionsSummary($categories, $options);
 
     $categories['block'] = array(
@@ -151,7 +150,6 @@ protected function getCacheType() {
    * Provide the default form for setting options.
    */
   public function buildOptionsForm(&$form, &$form_state) {
-    // It is very important to call the parent function here:
     parent::buildOptionsForm($form, $form_state);
 
     switch ($form_state['section']) {
@@ -189,7 +187,6 @@ public function buildOptionsForm(&$form, &$form_state) {
    * There is no need for this function to actually store the data.
    */
   public function submitOptionsForm(&$form, &$form_state) {
-    // It is very important to call the parent function here:
     parent::submitOptionsForm($form, $form_state);
     switch ($form_state['section']) {
       case 'display_id':
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 37572a8..27e46f4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -333,7 +333,8 @@ public function useMoreText() {
    * @return bool
    */
   public function acceptAttachments() {
-    // If the display doesn't use attachments, or it's the current display.
+    // To be able to accept attachments this display have to be able to use
+    // attachments but at the same time, you cannot attach a display to itself.
     if (!$this->usesAttachments() || ($this->definition['id'] == $this->view->current_display)) {
       return FALSE;
     }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
index 2522a3f..79493b1 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -144,6 +144,8 @@ protected function defineOptions() {
   public function optionsSummary(&$categories, &$options) {
     parent::optionsSummary($categories, $options);
 
+    // Since we're childing off the 'path' type, we'll still *call* our
+    // category 'page' but let's override it so it says feed settings.
     $categories['page'] = array(
       'title' => t('Feed settings'),
       'column' => 'second',
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index a74869c..da0efd6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -235,7 +235,6 @@ public function optionsSummary(&$categories, &$options) {
    * Overrides Drupal\views\Plugin\views\display\DisplayPluginBase::buildOptionsForm()..
    */
   public function buildOptionsForm(&$form, &$form_state) {
-    // It is very important to call the parent function here:
     parent::buildOptionsForm($form, $form_state);
 
     switch ($form_state['section']) {
@@ -257,7 +256,6 @@ public function buildOptionsForm(&$form, &$form_state) {
    * Overrides Drupal\views\Plugin\views\display\DisplayPluginBase::validateOptionsForm().
    */
   public function validateOptionsForm(&$form, &$form_state) {
-    // It is very important to call the parent function here:
     parent::validateOptionsForm($form, $form_state);
     switch ($form_state['section']) {
       case 'path':
@@ -275,7 +273,6 @@ public function validateOptionsForm(&$form, &$form_state) {
    * Overrides Drupal\views\Plugin\views\display\DisplayPluginBase::submitOptionsForm().
    */
   public function submitOptionsForm(&$form, &$form_state) {
-    // It is very important to call the parent function here:
     parent::submitOptionsForm($form, $form_state);
 
     switch ($form_state['section']) {