diff --git a/core/lib/Drupal/Core/EventListenerPass.php b/core/lib/Drupal/Core/EventListenerPass.php
index 54973cf..a107396 100644
--- a/core/lib/Drupal/Core/EventListenerPass.php
+++ b/core/lib/Drupal/Core/EventListenerPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\EventListenerPass
+ * Contains \Drupal\Core\EventListenerPass
  */
 
 namespace Drupal\Core;
@@ -28,7 +28,7 @@
  *     - access_subscriber:onKernelRequestAccessCheck
  * @endcode
  *
- * Additional you can also specify a priority:
+ * Additionally you can also specify a priority:
  *
  * @code
  *   kernel.request:
@@ -163,7 +163,7 @@ protected function defineService(ContainerBuilder $container, $class) {
    *   - method: The method name of the listener
    */
   protected function parseCallback($callback, ContainerBuilder $container) {
-    // TODO: This logic should abstracted somewhere.
+    // @TODO: Maybe use https://drupal.org/node/2165475 instead.
     $optional = $callback[0] == '?';
 
     // Callback in the service:method notation.
diff --git a/core/modules/views/views.events.yml b/core/modules/views/views.events.yml
index c68c984..d3dd1f1 100644
--- a/core/modules/views/views.events.yml
+++ b/core/modules/views/views.events.yml
@@ -1,3 +1,3 @@
 subscribers:
-  routing.route_dynamic:
-    - Drupal\views\EventSubscriber\RouteSubscriber::dynamicRoutes
+  routing.route_alter:
+    - views.route_subscriber:onAlterRoutes
diff --git a/core/modules/views/views.services.yml b/core/modules/views/views.services.yml
index 30aa96a..58898e0 100644
--- a/core/modules/views/views.services.yml
+++ b/core/modules/views/views.services.yml
@@ -85,8 +85,6 @@ services:
   views.route_subscriber:
     class: Drupal\views\EventSubscriber\RouteSubscriber
     arguments: ['@entity.manager', '@state']
-    tags:
-      - { name: 'event_subscriber' }
   views.route_access_check:
     class: Drupal\views\ViewsAccessCheck
     tags: