diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php
index f12f626..94d2564 100644
--- a/core/modules/views/src/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlock.php
@@ -35,7 +35,8 @@ public function build() {
               $value = $value->id();
             }
             $args[$argument_name] = $value;
-          } elseif ($argument->options['default_action'] == 'ignore') {
+          }
+          elseif ($argument->options['default_action'] == 'ignore') {
             $args[$argument_name] = $argument->options['exception']['value'];
           }
         }
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
index f08f1e2..610c9fd 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -133,7 +132,6 @@ public function getDerivativeDefinitions($base_plugin_definition) {
             }
           }
 
-
           $this->derivatives[$delta] += $base_plugin_definition;
         }
       }
diff --git a/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php b/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php
index f53f769..e87eae0 100644
--- a/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php
+++ b/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
@@ -82,7 +81,7 @@ public function testBlockContext() {
     $definition = $this->container->get('plugin.manager.block')
       ->getDefinition('views_block:test_view_block_with_context-block_1');
     $this->assertTrue($definition['context']['nid']);
-    /** @var ContextDefinitionInterface $context */
+    /** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
     $context = $definition['context']['nid'];
     $this->assertEqual($context->getDataType(), 'entity:node', 'Context definition data type is correct.');
     $this->assertEqual($context->getLabel(), 'Content: ID', 'Context definition label is correct.');