diff --git a/.arclint b/.arclint
--- a/.arclint
+++ b/.arclint
@@ -5,8 +5,8 @@
         },
         "clang-format": {
             "type": "clang-format",
-            "version": ">=7.0",
-            "bin": ["clang-format-7", "clang-format"],
+            "version": ">=8.0",
+            "bin": ["clang-format-8", "clang-format"],
             "include": "(^src/.*\\.(h|c|cpp|mm)$)",
             "exclude": [
                 "(^src/(secp256k1|univalue|leveldb)/)"
diff --git a/arcanist/linter/ClangFormatLinter.php b/arcanist/linter/ClangFormatLinter.php
--- a/arcanist/linter/ClangFormatLinter.php
+++ b/arcanist/linter/ClangFormatLinter.php
@@ -46,12 +46,12 @@
     }
 
     /*
-     * FIXME: This is a hack to only allow for clang-format version 7.x.
+     * FIXME: This is a hack to only allow for clang-format version 8.x.
      * The .arclint `version` field only allow to filter versions using `=`,
      * `>`, `<`, `>=` or `<=`. There is no facility to define that the required
-     * version should be >= 7.0 and < 8.0.
+     * version should be >= 8.0 and < 9.0.
      */
-    if ($version[0] != '7') {
+    if ($version[0] != '8') {
       throw new Exception(pht('Linter %s requires clang-format version 7.x. '.
                               'You have version %s.',
                               ClangFormatLinter::class,
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3273,14 +3273,15 @@
         pindexBestParked = nullptr;
     }
 
-    UpdateFlags(pindex,
-                [](const BlockStatus status) {
-                    return status.withClearedParkedFlags();
-                },
-                [fClearChildren](const BlockStatus status) {
-                    return fClearChildren ? status.withClearedParkedFlags()
-                                          : status.withParkedParent(false);
-                });
+    UpdateFlags(
+        pindex,
+        [](const BlockStatus status) {
+            return status.withClearedParkedFlags();
+        },
+        [fClearChildren](const BlockStatus status) {
+            return fClearChildren ? status.withClearedParkedFlags()
+                                  : status.withParkedParent(false);
+        });
 }
 
 void UnparkBlockAndChildren(CBlockIndex *pindex) {