diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
index 65af6623be71603fefd63b17ffa34bb98630711f..99ca4393c95df177b19579ae4113553fc281ae13 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
@@ -53,10 +53,6 @@ public function preQuery() {
         continue;
       }
 
-      if (isset($handler)) {
-        unset($handler);
-      }
-
       $handler = &$this->view->argument[$key];
       if (empty($handler->definition['accept depth modifier'])) {
         continue;
diff --git a/core/modules/views/src/Plugin/views/argument_validator/None.php b/core/modules/views/src/Plugin/views/argument_validator/None.php
index 8e8c96571f287b9749804ae33c7330505bf9e9ca..c74f5290d121e9816b6b276f2ff073f8684353d0 100644
--- a/core/modules/views/src/Plugin/views/argument_validator/None.php
+++ b/core/modules/views/src/Plugin/views/argument_validator/None.php
@@ -23,7 +23,7 @@ public function validateArgument($argument) {
       return FALSE;
     }
 
-    if (!empty($this->argument->definition['numeric']) && !isset($this->argument->options['break_phrase']) && !is_numeric($arg)) {
+    if (!empty($this->argument->definition['numeric']) && !isset($this->argument->options['break_phrase'])) {
       return FALSE;
     }
 
diff --git a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
index 9ebba38603e2e71698f1ffca4e505e0372643b23..64c3d7055784002e2721ffb59828fb404feb7e36 100644
--- a/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
+++ b/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
@@ -79,13 +79,7 @@ public function query() {
       $first['extra'] = $this->definition['join_extra'];
     }
 
-    if (!empty($def['join_id'])) {
-      $id = $def['join_id'];
-    }
-    else {
-      $id = 'standard';
-    }
-    $first_join = $this->joinManager->createInstance($id, $first);
+    $first_join = $this->joinManager->createInstance('standard', $first);
 
     $this->first_alias = $this->query->addTable($this->definition['field table'], $this->relationship, $first_join);
 
@@ -103,13 +97,7 @@ public function query() {
       $second['type'] = 'INNER';
     }
 
-    if (!empty($def['join_id'])) {
-      $id = $def['join_id'];
-    }
-    else {
-      $id = 'standard';
-    }
-    $second_join = $this->joinManager->createInstance($id, $second);
+    $second_join = $this->joinManager->createInstance('standard', $second);
     $second_join->adjusted = TRUE;
 
     // use a short alias for this:
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index beb105701dc4269a91285584aa1bf4b476e7e43a..133943b68e1c5a2e5571816f007692e680d27d24 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1145,11 +1145,6 @@ parameters:
 			count: 1
 			path: modules/taxonomy/src/Plugin/migrate/source/d7/TermTranslation.php
 
-		-
-			message: "#^Call to function unset\\(\\) contains undefined variable \\$handler\\.$#"
-			count: 1
-			path: modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
-
 		-
 			message: "#^Method Drupal\\\\taxonomy\\\\TermForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -1305,11 +1300,6 @@ parameters:
 			count: 1
 			path: modules/views/src/Plugin/views/argument/Date.php
 
-		-
-			message: "#^Undefined variable\\: \\$arg$#"
-			count: 1
-			path: modules/views/src/Plugin/views/argument_validator/None.php
-
 		-
 			message: "#^Method Drupal\\\\views\\\\Plugin\\\\views\\\\cache\\\\CachePluginBase\\:\\:cacheGet\\(\\) should return bool but return statement is missing\\.$#"
 			count: 1
@@ -1355,11 +1345,6 @@ parameters:
 			count: 2
 			path: modules/views/src/Plugin/views/filter/FilterPluginBase.php
 
-		-
-			message: "#^Undefined variable\\: \\$def$#"
-			count: 2
-			path: modules/views/src/Plugin/views/relationship/EntityReverse.php
-
 		-
 			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
 			count: 1