diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
index f7c5afb17be9a87394ec233e7bf8b777fda887c2..6885d023169e6138005809cf9b182d7b33a8986e 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
@@ -43,7 +43,7 @@ class LibraryDiscoveryCollector extends CacheCollector implements LibraryDiscove
    */
   public function __construct(CacheBackendInterface $cache, LockBackendInterface $lock, LibraryDiscoveryParser $discovery_parser, ThemeManagerInterface $theme_manager) {
     $this->themeManager = $theme_manager;
-    parent::__construct(NULL, $cache, $lock, ['library_info']);
+    parent::__construct('', $cache, $lock, ['library_info']);
 
     $this->discoveryParser = $discovery_parser;
   }
@@ -52,7 +52,7 @@ public function __construct(CacheBackendInterface $cache, LockBackendInterface $
    * {@inheritdoc}
    */
   protected function getCid() {
-    if (!isset($this->cid)) {
+    if ($this->cid === '') {
       $this->cid = 'library_info:' . $this->themeManager->getActiveTheme()->getName();
     }
 
@@ -186,7 +186,7 @@ public function getLibraryByName($extension, $name) {
    */
   public function reset() {
     parent::reset();
-    $this->cid = NULL;
+    $this->cid = '';
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/MenuActiveTrail.php b/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
index 978aeffbf4f4e6e0d39a8ce537a126bc89e49164..d11be878e6bf5bcc6772a51865e1e67b87239bfe 100644
--- a/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
+++ b/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
@@ -42,7 +42,7 @@ class MenuActiveTrail extends CacheCollector implements MenuActiveTrailInterface
    *   The lock backend.
    */
   public function __construct(MenuLinkManagerInterface $menu_link_manager, RouteMatchInterface $route_match, CacheBackendInterface $cache, LockBackendInterface $lock) {
-    parent::__construct(NULL, $cache, $lock);
+    parent::__construct('', $cache, $lock);
     $this->menuLinkManager = $menu_link_manager;
     $this->routeMatch = $route_match;
   }
@@ -53,7 +53,7 @@ public function __construct(MenuLinkManagerInterface $menu_link_manager, RouteMa
    * @see ::getActiveTrailIds()
    */
   protected function getCid() {
-    if (!isset($this->cid)) {
+    if ($this->cid === '') {
       $route_parameters = $this->routeMatch->getRawParameters()->all();
       ksort($route_parameters);
       $this->cid = 'active-trail:route:' . $this->routeMatch->getRouteName() . ':route_parameters:' . serialize($route_parameters);