diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 290a5d0d19c7fdcc4381abcdd56be68ea17c4616..4638dc72c439a200035303c50a45fd6802313269 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,8 @@
 ################
 
 workflow:
+  auto_cancel:
+    on_job_failure: all
   rules:
   # These 3 rules from https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml
     # Run on merge requests
@@ -144,6 +146,11 @@ default:
 
 .default-stage: &default-stage
   stage: 🗜️ Test
+  needs:
+    # Start the child jobs as soon as phpcs passes.
+    - "🧹 PHP Coding standards (PHPCS)"
+    - "📔 Spell-checking"
+
   trigger:
     # Rely on the status of the child pipeline.
     strategy: depend
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index db57ef7a9c5b9cc5a3ebdebab20f0464c3ac4328..3f4acdeac719714d9954a893f7ee2ccd5e6b0e99 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -1,12 +1,6 @@
 <?php declare(strict_types = 1);
 
 $ignoreErrors = [];
-$ignoreErrors[] = [
-	// identifier: empty.variable
-	'message' => '#^Variable \\$data_path in empty\\(\\) always exists and is not falsy\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../composer/Plugin/Scaffold/Operations/AppendOp.php',
-];
 $ignoreErrors[] = [
 	// identifier: variable.undefined
 	'message' => '#^Variable \\$app_root might not be defined\\.$#',