diff --git a/core/modules/views/src/EventSubscriber/RouteSubscriber.php b/core/modules/views/src/EventSubscriber/RouteSubscriber.php
index 7185614..5000a23 100644
--- a/core/modules/views/src/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/views/src/EventSubscriber/RouteSubscriber.php
@@ -132,7 +132,7 @@ public function routes() {
     foreach ($this->getViewsDisplayIDsWithRoute() as $pair) {
       list($view_id, $display_id) = explode('.', $pair);
       $view = $this->viewStorage->load($view_id);
-      if (($view = $this->executableFactory->get($view)) && $view instanceof ViewExecutable) {
+      if ($view = $this->executableFactory->get($view)) {
         if ($view->setDisplay($display_id) && $display = $view->displayHandlers->get($display_id)) {
           if ($display instanceof DisplayRouterInterface) {
             $this->viewRouteNames += (array) $display->collectRoutes($collection);
@@ -153,7 +153,7 @@ protected function alterRoutes(RouteCollection $collection) {
     foreach ($this->getViewsDisplayIDsWithRoute() as $pair) {
       list($view_id, $display_id) = explode('.', $pair);
       $view = $this->viewStorage->load($view_id);
-      if (($view = $this->executableFactory->get($view)) && $view instanceof ViewExecutable) {
+      if ($view = $this->executableFactory->get($view)) {
         if ($view->setDisplay($display_id) && $display = $view->displayHandlers->get($display_id)) {
           if ($display instanceof DisplayRouterInterface) {
             // If the display returns TRUE a route item was found, so it does not
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index 79ae997..9cdfab6 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -346,6 +346,7 @@ public function setModuleHandler(ModuleHandlerInterface $module_handler) {
    * Gets the executable factory.
    *
    * @return \Drupal\views\ViewExecutableFactory
+   *   The factory to load a view executable with.
    */
   protected function getExecutableFactory() {
     if (!$this->executableFactory) {
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index 6e43a7e..c03befa 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -83,8 +83,6 @@
    */
   var $always_required = FALSE;
 
-
-
   /**
    * Overrides \Drupal\views\Plugin\views\HandlerBase::init().
    *
diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index 5c4441a..aa4fbb0 100644
--- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -73,12 +73,12 @@ class GroupwiseMax extends RelationshipPluginBase {
   protected $executableFactory;
 
   /**
-   * Constructs an GroupwiseMax object.
+   * Constructs a GroupwiseMax object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
    * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
+   *   The plugin id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\views\ViewExecutableFactory $executable_factory
diff --git a/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/core/modules/views/src/Plugin/views/row/RowPluginBase.php
index 582dd09..33e6fe0 100644
--- a/core/modules/views/src/Plugin/views/row/RowPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RowPluginBase.php
@@ -70,7 +70,7 @@
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
    * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
+   *   The plugin id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\views\ViewExecutableFactory $executable_factory
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 0606c64..3170bf6 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -129,7 +129,7 @@
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
    * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
+   *   The plugin id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\views\ViewExecutableFactory $executable_factory
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 1deee30..8db8eef 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -41,7 +41,7 @@ class RouteSubscriberTest extends UnitTestCase {
   protected $routeSubscriber;
 
   /**
-   * The mocked view executable.
+   * The mocked view executable factory.
    *
    * @var \Drupal\views\ViewExecutableFactory|\PHPUnit_Framework_MockObject_MockObject
    */
diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
index baf8f22..c33d4e1 100644
--- a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
@@ -31,7 +31,7 @@ class ViewTest extends UnitTestCase {
   protected $viewHandler;
 
   /**
-   * The mocked view executable.
+   * The mocked view executable factory.
    *
    * @var \Drupal\views\ViewExecutableFactory|\PHPUnit_Framework_MockObject_MockObject
    */
diff --git a/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php b/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
index 96a8c86..5003a23 100644
--- a/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
+++ b/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
@@ -44,7 +44,7 @@ class ViewsHandlerManagerTest extends UnitTestCase {
   protected $factory;
 
   /**
-   * The mocked view executable.
+   * The mocked view executable factory.
    *
    * @var \Drupal\views\ViewExecutableFactory|\PHPUnit_Framework_MockObject_MockObject
    */
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 297b3a6..fabefb7 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -630,7 +630,6 @@ public function submitDisplayEnable($form, FormStateInterface $form_state) {
     $id = $form_state->get('display_id');
     $executable = $this->executableFactory->get($view);
     $executable->initDisplay();
-    // setOption doesn't work because this would might affect upper displays
     $executable->displayHandlers->get($id)->setOption('enabled', TRUE);
 
     // Store in cache