diff --git a/rector.php b/rector.php
index 589b8cd0..04ea7e2c 100644
--- a/rector.php
+++ b/rector.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 
@@ -16,6 +17,10 @@ return static function (RectorConfig $rectorConfig): void {
         InlineConstructorDefaultToPropertyRector::class,
     ]);
 
+    $rectorConfig->skip([
+        RemoveExtraParametersRector::class,
+    ]);
+
     $rectorConfig->sets([
         LevelSetList::UP_TO_PHP_81,
         SetList::CODE_QUALITY,
diff --git a/src/Bootstrappers/BootSubscribers.php b/src/Bootstrappers/BootSubscribers.php
index 387ee958..c38b873b 100644
--- a/src/Bootstrappers/BootSubscribers.php
+++ b/src/Bootstrappers/BootSubscribers.php
@@ -46,11 +46,7 @@ final class BootSubscribers implements Bootstrapper
 
             assert($instance instanceof Subscriber);
 
-            if (method_exists(Event\Facade::class, 'instance')) { // @phpstan-ignore-line
-                Event\Facade::instance()->registerSubscriber($instance);
-            } else {
-                Event\Facade::registerSubscriber($instance); // @phpstan-ignore-line
-            }
+            method_exists(Event\Facade::class, 'instance') ? Event\Facade::instance()->registerSubscriber($instance) : Event\Facade::registerSubscriber($instance); // @phpstan-ignore-line
         }
     }
 }
diff --git a/src/Logging/TeamCity/TeamCityLogger.php b/src/Logging/TeamCity/TeamCityLogger.php
index d89fcd9e..0394d058 100644
--- a/src/Logging/TeamCity/TeamCityLogger.php
+++ b/src/Logging/TeamCity/TeamCityLogger.php
@@ -237,11 +237,8 @@ final class TeamCityLogger
             new TestExecutionFinishedSubscriber($this),
         ];
 
-        if (method_exists(Facade::class, 'instance')) { // @phpstan-ignore-line
-            Facade::instance()->registerSubscribers(...$subscribers);
-        } else {
-            Facade::registerSubscribers(...$subscribers); // @phpstan-ignore-line
-        }
+        // @phpstan-ignore-next-line
+        method_exists(Facade::class, 'instance') ? Facade::instance()->registerSubscribers(...$subscribers) : Facade::registerSubscribers(...$subscribers);
     }
 
     private function setFlowId(): void
diff --git a/src/Plugins/Parallel/Paratest/WrapperRunner.php b/src/Plugins/Parallel/Paratest/WrapperRunner.php
index 7647c87e..37eb7634 100644
--- a/src/Plugins/Parallel/Paratest/WrapperRunner.php
+++ b/src/Plugins/Parallel/Paratest/WrapperRunner.php
@@ -115,11 +115,8 @@ final class WrapperRunner implements RunnerInterface
 
         TestResultFacade::init();
 
-        if (method_exists(EventFacade::class, 'instance')) { // @phpstan-ignore-line
-            EventFacade::instance()->seal();
-        } else {
-            EventFacade::seal(); // @phpstan-ignore-line
-        }
+        // @phpstan-ignore-next-line
+        method_exists(EventFacade::class, 'instance') ? EventFacade::instance()->seal() : EventFacade::seal();
 
         $suiteLoader = new SuiteLoader($this->options, $this->output, $this->codeCoverageFilterRegistry);
         $this->pending = $this->getTestFiles($suiteLoader);
@@ -359,7 +356,8 @@ final class WrapperRunner implements RunnerInterface
         }
 
         $coverageManager = new CodeCoverage();
-        $coverageManager->init($this->options->configuration, $this->codeCoverageFilterRegistry);
+
+        $coverageManager->init($this->options->configuration, $this->codeCoverageFilterRegistry, true);
         $coverageMerger = new CoverageMerger($coverageManager->codeCoverage());
         foreach ($this->coverageFiles as $coverageFile) {
             $coverageMerger->addCoverageFromFile($coverageFile);