diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php b/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
index 9f68a34..4dedcf7 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
@@ -156,8 +156,6 @@ private function generateLogEntries($count, $type = 'custom', $severity = WATCHD
    *   (optional) HTTP response code. Defaults to 200.
    */
   private function verifyReports($response = 200) {
-    $quote = ''';
-
     // View the database log help page.
     $this->drupalGet('admin/help/dblog');
     $this->assertResponse($response);
@@ -176,14 +174,14 @@ private function verifyReports($response = 200) {
     $this->drupalGet('admin/reports/page-not-found');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Top ' . $quote . 'page not found' . $quote . ' errors'), 'DBLog page-not-found report was displayed');
+      $this->assertText("Top 'page not found' errors", 'DBLog page-not-found report was displayed');
     }
 
     // View the database log access-denied report page.
     $this->drupalGet('admin/reports/access-denied');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Top ' . $quote . 'access denied' . $quote . ' errors'), 'DBLog access-denied report was displayed');
+      $this->assertText("Top 'access denied' errors", 'DBLog access-denied report was displayed');
     }
 
     // View the database log event page.
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index b87dddb..d51c3dd 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -943,10 +943,10 @@ function _node_revision_access(EntityInterface $node, $op = 'view', $account = N
  * @see node_menu()
  *
  * @deprecated
- *   Use \Drupal::service('access_manager')->checkNamedRoute('node_add_page');
+ *   Use \Drupal::service('access_manager')->checkNamedRoute('node.add_page');
  */
 function _node_add_access() {
-  return \Drupal::service('access_manager')->checkNamedRoute('node_add_page');
+  return \Drupal::service('access_manager')->checkNamedRoute('node.add_page');
 }
 
 /**
diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml
index b01c852..c77b72a 100644
--- a/core/modules/node/node.routing.yml
+++ b/core/modules/node/node.routing.yml
@@ -16,8 +16,6 @@ node.add_page:
   pattern: '/node/add'
   defaults:
     _controller: '\Drupal\node\Controller\NodeController::addPage'
-  options:
-    _access_mode: 'ALL'
   requirements:
     _permission: 'administer content types'
     _node_add_access: 'node'
diff --git a/core/modules/search/lib/Drupal/search/Controller/SearchController.php b/core/modules/search/lib/Drupal/search/Controller/SearchController.php
index dcc0b89..5fb214c 100644
--- a/core/modules/search/lib/Drupal/search/Controller/SearchController.php
+++ b/core/modules/search/lib/Drupal/search/Controller/SearchController.php
@@ -15,7 +15,15 @@ class SearchController {
   /**
    * @see search_view()
    */
-  public function view($plugin_id = NULL, $keys = NULL) {
+  public function searchView() {
+    module_load_include('pages.inc', 'search');
+    return search_view();
+  }
+
+  /**
+   * @see search_view()
+   */
+  public function searchViewPlugin($plugin_id, $keys) {
     module_load_include('pages.inc', 'search');
     return search_view($plugin_id, $keys);
   }
diff --git a/core/modules/search/lib/Drupal/search/Routing/SearchRouteSubscriber.php b/core/modules/search/lib/Drupal/search/Routing/SearchRouteSubscriber.php
index 50b2b19..2c1c2a2 100644
--- a/core/modules/search/lib/Drupal/search/Routing/SearchRouteSubscriber.php
+++ b/core/modules/search/lib/Drupal/search/Routing/SearchRouteSubscriber.php
@@ -55,7 +55,7 @@ public function routes(RouteBuildEvent $event) {
     foreach ($this->searchManager->getActiveDefinitions() as $plugin_id => $search_info) {
       $path = 'search/' . $search_info['path'];
       $defaults = array(
-        '_content' => 'Drupal\search\Controller\SearchController::searchView',
+        '_content' => 'Drupal\search\Controller\SearchController::searchViewPlugin',
         'plugin_id' => $plugin_id,
         'keys' => '',
       );
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 5a964c6..6b031e9 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -224,6 +224,21 @@ function search_get_default_plugin_info() {
 }
 
 /**
+ * Access callback: Determines access for a search page.
+ *
+ * @param string $plugin_id
+ *   The name of a search plugin (e.g., 'node_search').
+ *
+ * @return bool
+ *   TRUE if a user has access to the search page; FALSE otherwise.
+ *
+ * @see search_menu()
+ */
+function _search_menu_access($plugin_id) {
+  return \Drupal::service('access_manager')->checkNamedRoute('search.view_' . $plugin_id);
+}
+
+/**
  * Clears either a part of, or the entire search index.
  *
  * @param $sid
diff --git a/core/modules/search/search.routing.yml b/core/modules/search/search.routing.yml
index 84e496b..5383ee2 100644
--- a/core/modules/search/search.routing.yml
+++ b/core/modules/search/search.routing.yml
@@ -13,11 +13,9 @@ search.reindex_confirm:
     _permission: 'administer search'
 
 search.view:
-  pattern: '/search/{plugin_id}/{keys}'
+  pattern: '/search'
   defaults:
-    _content: '\Drupal\search\Controller\SearchController::view'
-    plugin_id: NULL
-    keys: ''
+    _content: '\Drupal\search\Controller\SearchController::searchView'
   options:
     _access_mode: 'ALL'
   requirements: