commit 2fe04400e72ae4d2fac098c12237143a7f0ce9b7
Author: Felix Lechner <felix.lechner@lease-up.com>
Date:   Sat Oct 30 21:30:20 2021 -0700

    Adjust sources to the new Perltidy version 20210717-1.
    
    Gbp-Dch: ignore

diff --git a/bin/lintian b/bin/lintian
index 5637956f9f..6d6f1848e7 100755
--- a/bin/lintian
+++ b/bin/lintian
@@ -502,7 +502,8 @@ my $PROFILE = Lintian::Profile->new;
 $PROFILE->load(
     $selected{profile},
     $selected{'include-dir'},
-    !$command_line{'no-user-dirs'});
+    !$command_line{'no-user-dirs'}
+);
 say {*STDERR} encode_utf8('Using profile ' . $PROFILE->name . $DOT)
   if $selected{debug};
 
@@ -511,7 +512,7 @@ my @from_file = $envlc->get_intersection;
 
 my @already = grep { defined $ENV{$_} } @from_file;
 warn encode_utf8(
-        'The environment overrides these settings in the configuration file: '
+    'The environment overrides these settings in the configuration file: '
       . join($SPACE, @already)
       . $NEWLINE)
   if @already;
@@ -602,8 +603,10 @@ if (@{$selected{'check-part'}} || @{$selected{tags}}) {
         $selected{'display-experimental'} = 1;
 
         # discard current display level; get everything
-        @display_level
-          = ([$PLUS, '>=', 'pedantic'], [$PLUS, $EQUAL, 'classification']);
+        @display_level= (
+            [$PLUS, '>=', 'pedantic'],
+            [$PLUS, $EQUAL, 'classification']
+        );
 
         $PROFILE->enable_tag($_) for @{$selected{tags}};
 
diff --git a/lib/Lintian/Check/AppstreamMetadata.pm b/lib/Lintian/Check/AppstreamMetadata.pm
index 0da161800e..82977bc448 100644
--- a/lib/Lintian/Check/AppstreamMetadata.pm
+++ b/lib/Lintian/Check/AppstreamMetadata.pm
@@ -58,7 +58,8 @@ sub installable {
         defined(
             my $dir
               = $processable->installed->resolve_path(
-                'usr/share/applications/'))
+                'usr/share/applications/')
+        )
     ) {
         for my $file ($dir->descendants) {
             $desktopfiles{$file} = 1 if ($file->is_file);
@@ -67,7 +68,8 @@ sub installable {
     if (
         defined(
             my $dir
-              = $processable->installed->resolve_path('usr/share/metainfo/'))
+              = $processable->installed->resolve_path('usr/share/metainfo/')
+        )
     ) {
         for my $file ($dir->children) {
             if ($file->is_file) {
@@ -79,7 +81,8 @@ sub installable {
     if (
         defined(
             my $dir
-              = $processable->installed->resolve_path('usr/share/appdata/'))
+              = $processable->installed->resolve_path('usr/share/appdata/')
+        )
     ) {
         for my $file ($dir->descendants) {
             if ($file->is_file) {
@@ -196,11 +199,13 @@ sub provides_user_device {
                 }
             }
             if (!$foundmatch) {
-                $self->hint((
-                    'appstream-metadata-missing-modalias-provide',
-                    "$udevrulefile:$linenum",
-                    "match rule $match*"
-                ));
+                $self->hint(
+                    (
+                        'appstream-metadata-missing-modalias-provide',
+                        "$udevrulefile:$linenum",
+                        "match rule $match*"
+                    )
+                );
             }
         }
     }
diff --git a/lib/Lintian/Check/Binaries/Architecture/Other.pm b/lib/Lintian/Check/Binaries/Architecture/Other.pm
index 1c8500d1f6..5b81eee124 100644
--- a/lib/Lintian/Check/Binaries/Architecture/Other.pm
+++ b/lib/Lintian/Check/Binaries/Architecture/Other.pm
@@ -46,7 +46,8 @@ has ARCH_REGEX => (
 
         return $self->profile->load_data('binaries/arch-regex', qr/\s*\~\~/,
             sub { return qr/$_[1]/ });
-    });
+    }
+);
 
 has ARCH_64BIT_EQUIVS => (
     is => 'rw',
@@ -56,7 +57,8 @@ has ARCH_64BIT_EQUIVS => (
 
         return $self->profile->load_data('binaries/arch-64bit-equivs',
             qr/\s*\=\>\s*/);
-    });
+    }
+);
 
 sub from_other_architecture {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Binaries/Hardening.pm b/lib/Lintian/Check/Binaries/Hardening.pm
index 1bcf8c69f4..d8ed9ccabb 100644
--- a/lib/Lintian/Check/Binaries/Hardening.pm
+++ b/lib/Lintian/Check/Binaries/Hardening.pm
@@ -39,7 +39,8 @@ has HARDENED_FUNCTIONS => (
         my ($self) = @_;
 
         return $self->profile->load_data('binaries/hardened-functions');
-    });
+    }
+);
 
 has recommended_hardening_features => (
     is => 'rw',
@@ -58,7 +59,8 @@ has recommended_hardening_features => (
           if $architecture ne 'all';
 
         return \%recommended_hardening_features;
-    });
+    }
+);
 
 has built_with_golang => (
     is => 'rw',
@@ -76,7 +78,8 @@ has built_with_golang => (
           if defined $source;
 
         return $built_with_golang;
-    });
+    }
+);
 
 sub installable {
     my ($self) = @_;
diff --git a/lib/Lintian/Check/Binaries/LargeFileSupport.pm b/lib/Lintian/Check/Binaries/LargeFileSupport.pm
index 9ca1543961..ab721ca836 100644
--- a/lib/Lintian/Check/Binaries/LargeFileSupport.pm
+++ b/lib/Lintian/Check/Binaries/LargeFileSupport.pm
@@ -42,7 +42,8 @@ has ARCH_REGEX => (
 
         return $self->profile->load_data('binaries/arch-regex', qr/\s*\~\~/,
             sub { return qr/$_[1]/ });
-    });
+    }
+);
 
 has LFS_SYMBOLS => (
     is => 'rw',
@@ -51,7 +52,8 @@ has LFS_SYMBOLS => (
         my ($self) = @_;
 
         return $self->profile->load_data('binaries/lfs-symbols');
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Binaries/Location.pm b/lib/Lintian/Check/Binaries/Location.pm
index 47abd3d722..0c88b2fa57 100644
--- a/lib/Lintian/Check/Binaries/Location.pm
+++ b/lib/Lintian/Check/Binaries/Location.pm
@@ -46,7 +46,8 @@ has DEB_HOST_MULTIARCH => (
         my ($self) = @_;
 
         return $self->profile->architectures->deb_host_multiarch;
-    });
+    }
+);
 
 has gnu_triplet_pattern => (
     is => 'rw',
@@ -65,7 +66,8 @@ has gnu_triplet_pattern => (
         }
 
         return $gnu_triplet_pattern;
-    });
+    }
+);
 
 has ruby_triplet_pattern => (
     is => 'rw',
@@ -78,7 +80,8 @@ has ruby_triplet_pattern => (
         $ruby_triplet_pattern =~ s{linux\\-gnu}{linux\\-};
 
         return $ruby_triplet_pattern;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Binaries/Obsolete/Crypt.pm b/lib/Lintian/Check/Binaries/Obsolete/Crypt.pm
index 4abf597aef..ac50945eff 100644
--- a/lib/Lintian/Check/Binaries/Obsolete/Crypt.pm
+++ b/lib/Lintian/Check/Binaries/Obsolete/Crypt.pm
@@ -40,7 +40,8 @@ has OBSOLETE_CRYPT_FUNCTIONS => (
 
         return $self->profile->load_data('binaries/obsolete-crypt-functions',
             qr/\s*\|\|\s*/);
-    });
+    }
+);
 
 sub installable {
     my ($self) = @_;
diff --git a/lib/Lintian/Check/Binaries/Prerequisites.pm b/lib/Lintian/Check/Binaries/Prerequisites.pm
index b1a88d2af0..5d6d3b5e77 100644
--- a/lib/Lintian/Check/Binaries/Prerequisites.pm
+++ b/lib/Lintian/Check/Binaries/Prerequisites.pm
@@ -59,7 +59,8 @@ has built_with_octave => (
           if defined $source;
 
         return $built_with_octave;
-    });
+    }
+);
 
 has files_by_library => (is => 'rw', default => sub  { {} });
 
@@ -108,7 +109,7 @@ sub visit_installed_files {
     my $depends = $self->processable->relation('strong');
 
     $self->hint('undeclared-elf-prerequisites', $item->name,
-            $LEFT_PARENTHESIS
+        $LEFT_PARENTHESIS
           . join($SPACE, sort +uniq @{$objdump->{NEEDED}})
           . $RIGHT_PARENTHESIS)
       if @{$objdump->{NEEDED} // [] }
diff --git a/lib/Lintian/Check/Binaries/Prerequisites/Numpy.pm b/lib/Lintian/Check/Binaries/Prerequisites/Numpy.pm
index e78262eb5d..199481f9dc 100644
--- a/lib/Lintian/Check/Binaries/Prerequisites/Numpy.pm
+++ b/lib/Lintian/Check/Binaries/Prerequisites/Numpy.pm
@@ -91,7 +91,8 @@ sub installable {
         || !$depends->matches(
             qr/^python3-numpy \(<[<=][^\|]+$/,
             Lintian::Relation::VISIT_OR_CLAUSE_FULL
-        ))&& $self->processable->name !~ m{\A python3?-numpy \Z}xsm;
+        )
+      )&& $self->processable->name !~ m{\A python3?-numpy \Z}xsm;
 
     return;
 }
diff --git a/lib/Lintian/Check/Binaries/Rpath.pm b/lib/Lintian/Check/Binaries/Rpath.pm
index 9026a66c6a..9f8aec0b24 100644
--- a/lib/Lintian/Check/Binaries/Rpath.pm
+++ b/lib/Lintian/Check/Binaries/Rpath.pm
@@ -45,7 +45,8 @@ has DEB_HOST_MULTIARCH => (
         my ($self) = @_;
 
         return $self->profile->architectures->deb_host_multiarch;
-    });
+    }
+);
 
 has multiarch_component => (
     is => 'rw',
@@ -57,7 +58,8 @@ has multiarch_component => (
         my $multiarch_component = $self->DEB_HOST_MULTIARCH->{$architecture};
 
         return $multiarch_component;
-    });
+    }
+);
 
 has private_folders => (
     is => 'rw',
@@ -93,7 +95,8 @@ has private_folders => (
         }
 
         return \@normalized;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Binaries/Spelling.pm b/lib/Lintian/Check/Binaries/Spelling.pm
index 8bed40add3..73b2df5249 100644
--- a/lib/Lintian/Check/Binaries/Spelling.pm
+++ b/lib/Lintian/Check/Binaries/Spelling.pm
@@ -42,7 +42,8 @@ has BINARY_SPELLING_EXCEPTIONS => (
 
         return $self->profile->load_data('binaries/spelling-exceptions',
             qr/\s+/);
-    });
+    }
+);
 
 sub spelling_tag_emitter {
     my ($self, @orig_args) = @_;
diff --git a/lib/Lintian/Check/Binaries/Static.pm b/lib/Lintian/Check/Binaries/Static.pm
index fbc8e4fa5c..63e4ad533a 100644
--- a/lib/Lintian/Check/Binaries/Static.pm
+++ b/lib/Lintian/Check/Binaries/Static.pm
@@ -48,7 +48,8 @@ has built_with_golang => (
           if defined $source;
 
         return $built_with_golang;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/BuildSystems/Autotools/Libtool.pm b/lib/Lintian/Check/BuildSystems/Autotools/Libtool.pm
index 548b3801bf..53b05e2f15 100644
--- a/lib/Lintian/Check/BuildSystems/Autotools/Libtool.pm
+++ b/lib/Lintian/Check/BuildSystems/Autotools/Libtool.pm
@@ -51,7 +51,8 @@ has libtool_in_build_depends => (
 
         return $self->processable->relation('Build-Depends-All')
           ->satisfies($LIBTOOL);
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
@@ -80,7 +81,9 @@ sub visit_patched_files {
                 && (
                     $minor < $ACCEPTABLE_LIBTOOL_MINOR
                     || (   $minor == $ACCEPTABLE_LIBTOOL_MINOR
-                        && $debian < $ACCEPTABLE_LIBTOOL_DEBIAN)));
+                        && $debian < $ACCEPTABLE_LIBTOOL_DEBIAN)
+                )
+              );
         }
     }
 
diff --git a/lib/Lintian/Check/ChangesFile.pm b/lib/Lintian/Check/ChangesFile.pm
index 48e19d130e..3b3e15bda0 100644
--- a/lib/Lintian/Check/ChangesFile.pm
+++ b/lib/Lintian/Check/ChangesFile.pm
@@ -59,7 +59,7 @@ sub changes {
             if (defined $checksum_info) {
                 if ($file_info->{size} != $checksum_info->{filesize}) {
                     $self->hint('file-size-mismatch-in-changes-file', $file,
-                           $file_info->{size} . ' != '
+                        $file_info->{size} . ' != '
                           .$checksum_info->{filesize});
                 }
             }
diff --git a/lib/Lintian/Check/ControlFiles.pm b/lib/Lintian/Check/ControlFiles.pm
index 2c755290f2..822751a5fc 100644
--- a/lib/Lintian/Check/ControlFiles.pm
+++ b/lib/Lintian/Check/ControlFiles.pm
@@ -111,7 +111,7 @@ sub installable {
         # correct owner?
         unless ($file->identity eq 'root/root' || $file->identity eq '0/0') {
             $self->hint('control-file-has-bad-owner',
-                    $file->name
+                $file->name
                   . $SPACE
                   . $file->identity
                   . ' != root/root (or 0/0)');
diff --git a/lib/Lintian/Check/Cruft.pm b/lib/Lintian/Check/Cruft.pm
index d2cc1187d3..3cbfaa4762 100644
--- a/lib/Lintian/Check/Cruft.pm
+++ b/lib/Lintian/Check/Cruft.pm
@@ -80,8 +80,10 @@ has RFC_WHITELIST => (
             qr/\s*\~\~\s*/,
             sub {
                 return qr/$_[0]/xms;
-            });
-    });
+            }
+        );
+    }
+);
 
 # get browserified regexp
 has BROWSERIFY_REGEX => (
@@ -95,14 +97,17 @@ has BROWSERIFY_REGEX => (
             qr/\s*\~\~\s*/,
             sub {
                 return qr/$_[1]/xms;
-            });
-    });
+            }
+        );
+    }
+);
 
 my %NVIDIA_LICENSE = (
     keywords => [qw{license intellectual retain property}],
     sentences =>[
 'retain all intellectual property and proprietary rights in and to this software and related documentation'
-    ]);
+    ]
+);
 
 my %NON_FREE_LICENSES = (
 # first field is tag
@@ -196,7 +201,8 @@ qr{microsoft [ ] visual [ ] c[+][+] [ ] generated (?![ ] by [ ] freeze\.py)}msx
         sentences => ['the fall-through switches in utf-8 reading'],
         regex =>
 qr{the [ ] fall-through [ ] switches [ ] in [ ] utf-8 [ ] reading [ ] code [ ] save}msx
-    });
+    }
+);
 
 # get usual data about admissible/not admissible GFDL invariant part of license
 has GFDL_FRAGMENTS => (
@@ -246,8 +252,10 @@ has GFDL_FRAGMENTS => (
                 }
 
                 return \%ret;
-            });
-    });
+            }
+        );
+    }
+);
 
 # Directory checks.  These regexes match a directory that shouldn't be in the
 # source package and associate it with a tag (minus the leading
@@ -729,7 +737,8 @@ sub warn_prebuilt_javascript{
                 '.debug.js' => '(?i)\.js$',
                 '-debug.js' => '(?i)\.js$',
                 $EMPTY => $EMPTY
-            });
+            }
+          );
 
     } else  {
         # html file
@@ -812,8 +821,8 @@ sub warn_long_lines {
     my ($self, $item, $lowercase) = @_;
 
     my ($maximum, $position) = $self->maximum_line_length($lowercase);
-   # first check if line >  $VERY_LONG_LINE_LENGTH that is likely minification
-   # avoid problem by recursive regex with longline
+    # first check if line >  $VERY_LONG_LINE_LENGTH that is likely minification
+    # avoid problem by recursive regex with longline
     if ($maximum > $VERY_LONG_LINE_LENGTH) {
 
         # clean up jslint craps line
diff --git a/lib/Lintian/Check/DebFormat.pm b/lib/Lintian/Check/DebFormat.pm
index 8c283d8c55..2334098bf8 100644
--- a/lib/Lintian/Check/DebFormat.pm
+++ b/lib/Lintian/Check/DebFormat.pm
@@ -143,7 +143,8 @@ sub installable {
                     'malformed-deb-archive',
                     join($SPACE,
                         "second (official) member $ctrl_member",
-                        'not control.tar.(gz|xz)'));
+                        'not control.tar.(gz|xz)')
+                );
                 $failed = 1;
             } elsif ($ctrl_member eq 'control.tar') {
                 $self->hint('uses-no-compression-for-control-tarball');
@@ -168,7 +169,8 @@ sub installable {
                     'malformed-deb-archive',
                     join($SPACE,
                         "third (official) member $data_member",
-                        'not data.tar.(gz|xz|bz2|lzma)'));
+                        'not data.tar.(gz|xz|bz2|lzma)')
+                );
                 $failed = 1;
             } elsif ($self->processable->type eq 'udeb'
                 && $data_member !~ m/^data\.tar\.[gx]z$/) {
diff --git a/lib/Lintian/Check/Debian/Changelog.pm b/lib/Lintian/Check/Debian/Changelog.pm
index 3211260a32..3544713dcc 100644
--- a/lib/Lintian/Check/Debian/Changelog.pm
+++ b/lib/Lintian/Check/Debian/Changelog.pm
@@ -228,7 +228,7 @@ sub source {
             }
 
             $self->hint('changelog-file-missing-explicit-entry',
-                    $previous_version->literal
+                $previous_version->literal
                   . " -> $expected_previous (missing) -> "
                   . $latest_version->literal)
               unless $previous_version->literal eq $expected_previous
@@ -269,14 +269,14 @@ sub source {
                   && $latest_version->source_nmu != 1;
 
                 $self->hint('non-consecutive-debian-revision',
-                        $previous_version->literal . ' -> '
+                    $previous_version->literal . ' -> '
                       . $latest_version->literal)
                   if $non_consecutive;
             }
 
             if ($latest_version->epoch ne $previous_version->epoch) {
                 $self->hint('epoch-change-without-comment',
-                        $previous_version->literal . ' -> '
+                    $previous_version->literal . ' -> '
                       . $latest_version->literal)
                   unless $latest_entry->Changes =~ /\bepoch\b/im;
 
@@ -402,7 +402,8 @@ sub binary {
                     $news->Changes,
                     $group->spelling_exceptions,
                     $self->spelling_tag_emitter(
-                        'spelling-error-in-news-debian'));
+                        'spelling-error-in-news-debian')
+                );
                 if ($news->Changes =~ /^\s*\*\s/) {
                     $self->hint('debian-news-entry-uses-asterisk');
                 }
@@ -760,7 +761,8 @@ sub binary {
         check_spelling(
             $self->profile,$changes,
             $group->spelling_exceptions,
-            $self->spelling_tag_emitter('spelling-error-in-changelog'));
+            $self->spelling_tag_emitter('spelling-error-in-changelog')
+        );
     }
 
     return;
@@ -798,7 +800,7 @@ sub check_dch {
         }
 
         if (
-               $line =~ /closes:\s*(((?:bug)?\#?\s?\d*)[[:alpha:]]\w*)/i
+            $line =~ /closes:\s*(((?:bug)?\#?\s?\d*)[[:alpha:]]\w*)/i
             || $line =~ m{closes:\s*(?:bug)?\#?\s?\d+
               (?:,\s*(?:bug)?\#?\s?\d+)*
               (?:,\s*(((?:bug)?\#?\s?\d*)[[:alpha:]]\w*))}ix
diff --git a/lib/Lintian/Check/Debian/Control.pm b/lib/Lintian/Check/Debian/Control.pm
index 99fd0fa300..57c0a7a70b 100644
--- a/lib/Lintian/Check/Debian/Control.pm
+++ b/lib/Lintian/Check/Debian/Control.pm
@@ -476,7 +476,8 @@ sub source {
         $self->hint('silent-on-rules-requiring-root');
     }
 
-    if ((
+    if (
+        (
             $processable->debian_control->source_fields->value(
                 'Rules-Requires-Root')
             || 'no'
@@ -540,7 +541,8 @@ sub source {
         $self->hint('missing-xs-go-import-path-for-golang-package')
           unless (
             $processable->debian_control->source_fields->value(
-                'XS-Go-Import-Path'));
+                'XS-Go-Import-Path')
+          );
     }
 
     my $changes = $group->changes;
@@ -563,7 +565,8 @@ sub dbg_pkg_is_known {
         qr/\s*\~\~\s*/,
         sub {
             return qr/$_[0]/xms;
-        });
+        }
+    );
 
     foreach my $dbg_regexp ($KNOWN_DBG_PACKAGE->all) {
         my $regex = $KNOWN_DBG_PACKAGE->value($dbg_regexp);
diff --git a/lib/Lintian/Check/Debian/Copyright.pm b/lib/Lintian/Check/Debian/Copyright.pm
index a184a57ffe..1855226fcf 100644
--- a/lib/Lintian/Check/Debian/Copyright.pm
+++ b/lib/Lintian/Check/Debian/Copyright.pm
@@ -282,7 +282,8 @@ sub binary {
                 $contents =~ m{ \b \QGNU GENERAL PUBLIC LICENSE\E
                                    \s* \QVersion 3\E }msx
                 && $contents =~ m{ \b \QTERMS AND CONDITIONS\E \s }msx
-            ))
+            )
+        )
     ) {
         $self->hint('copyright-file-contains-full-gpl-license');
         $gpl = 1;
@@ -319,7 +320,7 @@ sub binary {
     # e-mail discussions of licensing are included in the copyright
     # file but aren't referring to the license of the package.
     unless (
-           $contents =~ m{/usr/share/common-licenses}
+        $contents =~ m{/usr/share/common-licenses}
         || $contents =~ m/Zope Public License/
         || $contents =~ m/LICENSE AGREEMENT FOR PYTHON 1.6.1/
         || $contents =~ m/LaTeX Project Public License/
@@ -382,7 +383,8 @@ qr/GNU (?:Lesser|Library) General Public License|(?-i:\bLGPL\b)/i
                 $text
                   =~ /(?:under )?(?:the )?(?:same )?(?:terms )?as Perl itself\b/i
                   && $text !~ m{usr/share/common-licenses/};
-            })
+            }
+        )
     ) {
         $self->hint('copyright-file-lacks-pointer-to-perl-license');
     }
diff --git a/lib/Lintian/Check/Debian/Copyright/ApacheNotice.pm b/lib/Lintian/Check/Debian/Copyright/ApacheNotice.pm
index d5ad168fb5..375f0877d6 100644
--- a/lib/Lintian/Check/Debian/Copyright/ApacheNotice.pm
+++ b/lib/Lintian/Check/Debian/Copyright/ApacheNotice.pm
@@ -65,7 +65,7 @@ sub check_apache_notice_files {
       unless $contents =~ /apache[-\s]+2\./i;
 
     my @notice_files = grep {
-              $_->basename =~ /^NOTICE(\.txt)?$/
+        $_->basename =~ /^NOTICE(\.txt)?$/
           and $_->is_open_ok
           and $_->bytes =~ /apache/i
     } @{$self->processable->patched->sorted_list};
diff --git a/lib/Lintian/Check/Debian/Copyright/Dep5.pm b/lib/Lintian/Check/Debian/Copyright/Dep5.pm
index af1fc648bb..f874f10de0 100644
--- a/lib/Lintian/Check/Debian/Copyright/Dep5.pm
+++ b/lib/Lintian/Check/Debian/Copyright/Dep5.pm
@@ -257,7 +257,7 @@ sub check_dep5_copyright {
     for my $section (@license_sections) {
 
         $self->hint('tab-in-license-text',
-                $copyright_file->name
+            $copyright_file->name
               . ' (starting at line '
               . $section->position('License') . ')')
           if $section->untrimmed_value('License') =~ /\t/;
@@ -401,7 +401,7 @@ sub check_dep5_copyright {
       && none { $header->declares($_) } qw(Comment Files-Excluded);
 
     my @ambiguous_sections = grep {
-             $_->declares('License')
+        $_->declares('License')
           && $_->declares('Copyright')
           && !$_->declares('Files')
     } @followers;
@@ -719,16 +719,20 @@ sub check_dep5_copyright {
                 $wildcard,
                 'in lines',
                 map { $_->position('Files') }
-                  @{$sections_by_wildcard{$wildcard}});
+                  @{$sections_by_wildcard{$wildcard}}
+            );
         }
 
         # do not issue next tag for duplicates or redundant wildcards
         my $wildcard_lc = List::Compare->new(
             [keys %sections_by_wildcard],
-            [(
+            [
+                (
                     values %wildcard_by_file, @duplicate_wildcards,
                     @redundant_wildcards
-                )]);
+                )
+            ]
+        );
         my @matches_nothing = $wildcard_lc->get_Lonly;
 
         for my $wildcard (@matches_nothing) {
@@ -748,7 +752,8 @@ sub check_dep5_copyright {
 
             push(
                 @{$sections_by_file{$name}},
-                @{$sections_by_wildcard{$wildcard}});
+                @{$sections_by_wildcard{$wildcard}}
+            );
         }
 
         my %license_identifiers_by_file;
diff --git a/lib/Lintian/Check/Debian/Debconf.pm b/lib/Lintian/Check/Debian/Debconf.pm
index 160c8ba245..1b9729249e 100644
--- a/lib/Lintian/Check/Debian/Debconf.pm
+++ b/lib/Lintian/Check/Debian/Debconf.pm
@@ -79,7 +79,8 @@ my $ANY_DEBCONF = Lintian::Relation->new->load(
     join(
         ' | ', qw(debconf debconf-2.0 cdebconf
           cdebconf-udeb libdebconfclient0 libdebconfclient0-udeb)
-    ));
+    )
+);
 
 sub source {
     my ($self) = @_;
@@ -167,7 +168,7 @@ sub installable {
     # the confmodule in the postinst so that debconf can register
     # their templates.
     return
-         unless $seenconfig
+      unless $seenconfig
       or $seentemplates
       or $usespreinst;
 
@@ -461,7 +462,7 @@ sub installable {
                 }
 
                 if (
-                      !$obsoleteconfmodule
+                    !$obsoleteconfmodule
                     && $line =~ m{(/usr/share/debconf/confmodule\.sh|
                    Debian::DebConf::Client::ConfModule)}x
                 ) {
@@ -508,8 +509,10 @@ sub installable {
                             $potential_db_abuse{$template}
                             and (
                                 not($potential_makedev->{($. - 1)}
-                                    and ($priority eq 'low')))
-                            and ($priority eq 'low' || $priority eq 'medium'));
+                                    and ($priority eq 'low'))
+                            )
+                            and ($priority eq 'low' || $priority eq 'medium')
+                          );
                     }
                 }
 
diff --git a/lib/Lintian/Check/Debian/Filenames.pm b/lib/Lintian/Check/Debian/Filenames.pm
index a2d6f94ebd..fd2a327308 100644
--- a/lib/Lintian/Check/Debian/Filenames.pm
+++ b/lib/Lintian/Check/Debian/Filenames.pm
@@ -39,7 +39,8 @@ sub source {
         { correct => 'NEWS', problematic => 'NEWS.Debian' },
         { correct => 'NEWS', problematic => 'NEWS.debian' },
         { correct => 'TODO', problematic => 'TODO.Debian' },
-        { correct => 'TODO', problematic => 'TODO.debian' });
+        { correct => 'TODO', problematic => 'TODO.debian' }
+    );
 
     for my $relative (@often_misnamed) {
 
diff --git a/lib/Lintian/Check/Debian/LintianOverrides/Comments.pm b/lib/Lintian/Check/Debian/LintianOverrides/Comments.pm
index b25f50c324..ab13d9b1cb 100644
--- a/lib/Lintian/Check/Debian/LintianOverrides/Comments.pm
+++ b/lib/Lintian/Check/Debian/LintianOverrides/Comments.pm
@@ -59,7 +59,8 @@ sub always {
                     $self->emitter(
                         'spelling-in-override-comment',
                         "$tagname (line $position)"
-                    ));
+                    )
+                );
 
                 check_spelling_picky(
                     $self->profile,
@@ -67,7 +68,8 @@ sub always {
                     $self->emitter(
                         'capitalization-in-override-comment',
                         "$tagname (line $position)"
-                    ));
+                    )
+                );
             } continue {
                 $position++;
             }
diff --git a/lib/Lintian/Check/Debian/Patches/Dep3.pm b/lib/Lintian/Check/Debian/Patches/Dep3.pm
index 378b9ecdfd..7ea6c21a22 100644
--- a/lib/Lintian/Check/Debian/Patches/Dep3.pm
+++ b/lib/Lintian/Check/Debian/Patches/Dep3.pm
@@ -86,7 +86,8 @@ sub visit_patched_files {
       || none { length } (
         $deb822->last_mention('Applied-Upstream'),
         $deb822->last_mention('Bug'),
-        $deb822->last_mention('Forwarded'));
+        $deb822->last_mention('Forwarded')
+      );
 
     return;
 }
diff --git a/lib/Lintian/Check/Debian/PoDebconf.pm b/lib/Lintian/Check/Debian/PoDebconf.pm
index 989dddd4f1..4e01953e68 100644
--- a/lib/Lintian/Check/Debian/PoDebconf.pm
+++ b/lib/Lintian/Check/Debian/PoDebconf.pm
@@ -332,8 +332,10 @@ sub source {
           for grep { $_ ne 'PATH' && $_ ne 'TMPDIR' } keys %ENV;
         local $ENV{LC_ALL} = 'C';
 
-        my @command = ('msgfmt', '-o', '/dev/null', '--statistics',
-            $po_path->unpacked_path);
+        my @command = (
+            'msgfmt', '-o', '/dev/null', '--statistics',
+            $po_path->unpacked_path
+        );
 
         run3(\@command, \undef, \undef, \$stats);
 
diff --git a/lib/Lintian/Check/Debian/Readme.pm b/lib/Lintian/Check/Debian/Readme.pm
index f84e61e41f..cd2c043bd6 100644
--- a/lib/Lintian/Check/Debian/Readme.pm
+++ b/lib/Lintian/Check/Debian/Readme.pm
@@ -103,7 +103,8 @@ sub installable {
     check_spelling(
         $self->profile,$readme,
         $group->spelling_exceptions,
-        $self->spelling_tag_emitter('spelling-error-in-readme-debian'));
+        $self->spelling_tag_emitter('spelling-error-in-readme-debian')
+    );
 
     return;
 }
diff --git a/lib/Lintian/Check/Debian/Rules.pm b/lib/Lintian/Check/Debian/Rules.pm
index 7751fdae61..f9d5050ec2 100644
--- a/lib/Lintian/Check/Debian/Rules.pm
+++ b/lib/Lintian/Check/Debian/Rules.pm
@@ -580,7 +580,7 @@ sub source {
 
     if (my $pointer = $overridden{'dh_auto_test'}) {
         my @rules = grep {
-                 !m{^\t\s*[\:\[]}
+            !m{^\t\s*[\:\[]}
               && !m{^\s*$}
               && !m{\bdh_auto_test\b}
               && !
diff --git a/lib/Lintian/Check/Debian/Shlibs.pm b/lib/Lintian/Check/Debian/Shlibs.pm
index 7d7495bbab..682d998f78 100644
--- a/lib/Lintian/Check/Debian/Shlibs.pm
+++ b/lib/Lintian/Check/Debian/Shlibs.pm
@@ -65,7 +65,8 @@ has soname_by_filename => (
         }
 
         return \%soname_by_filename;
-    });
+    }
+);
 
 has shlibs_positions_by_pretty_soname => (is => 'rw', default => sub { {} });
 has symbols_positions_by_soname => (is => 'rw', default => sub { {} });
diff --git a/lib/Lintian/Check/Debian/SourceDir.pm b/lib/Lintian/Check/Debian/SourceDir.pm
index d9922e87fd..e38173a9ee 100644
--- a/lib/Lintian/Check/Debian/SourceDir.pm
+++ b/lib/Lintian/Check/Debian/SourceDir.pm
@@ -106,9 +106,11 @@ sub source {
                 my $comment_line = <$series_fd>;
                 my $count = grep { !/^\s*+\#|^\s*+$/ } <$series_fd>;
                 $self->hint('git-patches-not-exported')
-                  unless ($count
+                  unless (
+                    $count
                     && ($comment_line
-                        =~ /^\s*\#.*quilt-patches-deb-export-hook/));
+                        =~ /^\s*\#.*quilt-patches-deb-export-hook/)
+                  );
                 close($series_fd);
             }
         }
diff --git a/lib/Lintian/Check/Debian/Upstream/SigningKey.pm b/lib/Lintian/Check/Debian/Upstream/SigningKey.pm
index 1249c23fbb..7b43cc5c3f 100644
--- a/lib/Lintian/Check/Debian/Upstream/SigningKey.pm
+++ b/lib/Lintian/Check/Debian/Upstream/SigningKey.pm
@@ -75,7 +75,8 @@ sub source {
             '--attribute-fd', '1',
             '--status-fd', '2',
             '--with-colons', '--list-packets',
-            $key_locations{$key_name});
+            $key_locations{$key_name}
+        );
         my $bytes = safe_qx(@command);
 
         if ($?) {
diff --git a/lib/Lintian/Check/Debian/Watch.pm b/lib/Lintian/Check/Debian/Watch.pm
index 1803b623e1..608fc31902 100644
--- a/lib/Lintian/Check/Debian/Watch.pm
+++ b/lib/Lintian/Check/Debian/Watch.pm
@@ -77,8 +77,10 @@ sub source {
     my $contents = $file->bytes;
 
     # each pattern marks a multi-line (!) selection for the tag message
-    my @templatepatterns
-      = (qr/^\s*#\s*(Example watch control file for uscan)/mi,qr/(<project>)/);
+    my @templatepatterns= (
+        qr/^\s*#\s*(Example watch control file for uscan)/mi,
+        qr/(<project>)/
+    );
     my $templatestring;
 
     for my $pattern (@templatepatterns) {
diff --git a/lib/Lintian/Check/Desktop/Gnome/Gir.pm b/lib/Lintian/Check/Desktop/Gnome/Gir.pm
index 65c6bba261..0184628382 100644
--- a/lib/Lintian/Check/Desktop/Gnome/Gir.pm
+++ b/lib/Lintian/Check/Desktop/Gnome/Gir.pm
@@ -78,10 +78,12 @@ sub installable {
         = $processable->installed->resolve_path('usr/lib/girepository-1.0/')) {
         push @typelibs, $dir->children;
         foreach my $typelib ($dir->children) {
-            $self->hint((
-                'typelib-not-in-multiarch-directory',$typelib,
-                "usr/lib/$madir/girepository-1.0"
-            ));
+            $self->hint(
+                (
+                    'typelib-not-in-multiarch-directory',$typelib,
+                    "usr/lib/$madir/girepository-1.0"
+                )
+            );
         }
     }
 
diff --git a/lib/Lintian/Check/Desktop/X11/Font/Update.pm b/lib/Lintian/Check/Desktop/X11/Font/Update.pm
index b431c8d2a2..b750e09d39 100644
--- a/lib/Lintian/Check/Desktop/X11/Font/Update.pm
+++ b/lib/Lintian/Check/Desktop/X11/Font/Update.pm
@@ -55,7 +55,8 @@ has x_fonts => (
           @{$self->processable->installed->sorted_list};
 
         return \@x_fonts;
-    });
+    }
+);
 
 sub visit_control_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Documentation.pm b/lib/Lintian/Check/Documentation.pm
index 718985d37a..56c6964106 100644
--- a/lib/Lintian/Check/Documentation.pm
+++ b/lib/Lintian/Check/Documentation.pm
@@ -73,7 +73,8 @@ has COMPRESS_FILE_EXTENSIONS => (
 
         return $self->profile->load_data('files/compressed-file-extensions',
             qr/\s++/,sub { return qr/\Q$_[0]\E/ });
-    });
+    }
+);
 
 # an OR (|) regex of all compressed extension
 has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
@@ -87,7 +88,8 @@ has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
               $self->COMPRESS_FILE_EXTENSIONS->all);
 
         return qr/$text/;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Documentation/Manual.pm b/lib/Lintian/Check/Documentation/Manual.pm
index 411f8361b2..655d6159b0 100644
--- a/lib/Lintian/Check/Documentation/Manual.pm
+++ b/lib/Lintian/Check/Documentation/Manual.pm
@@ -166,8 +166,9 @@ sub visit_installed_files {
             #    ../../man/man?/undocumented...
             #    ../../../share/man/man?/undocumented...
             #    ../../../../usr/share/man/man?/undocumented...
-            if ((
-                       $file->link =~ m{^undocumented\.([237])\.gz}
+            if (
+                (
+                    $file->link =~ m{^undocumented\.([237])\.gz}
                     && $page_path =~ m{^usr/share/man/man$1}
                 )
                 || $file->link =~ m{^\.\./man[237]/undocumented\.[237]\.gz$}
diff --git a/lib/Lintian/Check/Emacs/Elpa.pm b/lib/Lintian/Check/Emacs/Elpa.pm
index 709c099d2b..348f52e18e 100644
--- a/lib/Lintian/Check/Emacs/Elpa.pm
+++ b/lib/Lintian/Check/Emacs/Elpa.pm
@@ -40,7 +40,9 @@ sub installable {
             'usr/lib/emacsen-common/packages/install/')
         && (
             not $processable->installed->lookup(
-                'usr/share/emacs/site-lisp/elpa-src/')));
+                'usr/share/emacs/site-lisp/elpa-src/')
+        )
+      );
 
     return;
 }
diff --git a/lib/Lintian/Check/Examples.pm b/lib/Lintian/Check/Examples.pm
index 42e24d31ed..ae7f9f576d 100644
--- a/lib/Lintian/Check/Examples.pm
+++ b/lib/Lintian/Check/Examples.pm
@@ -57,7 +57,8 @@ has group_ships_examples => (
           if any { m{^usr/share/doc/(.+/)?examples/?$} } @shipped;
 
         return 0;
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Fields/Architecture.pm b/lib/Lintian/Check/Fields/Architecture.pm
index 8e61a7da63..2c4c644535 100644
--- a/lib/Lintian/Check/Fields/Architecture.pm
+++ b/lib/Lintian/Check/Fields/Architecture.pm
@@ -88,7 +88,8 @@ sub always {
           || (
             $installable_architecture eq 'source'
             && (   $self->processable->type eq 'changes'
-                || $self->processable->type eq 'buildinfo'));
+                || $self->processable->type eq 'buildinfo')
+          );
     }
 
     # check for magic installable architecture combinations
diff --git a/lib/Lintian/Check/Fields/Derivatives.pm b/lib/Lintian/Check/Fields/Derivatives.pm
index e045b9e928..6ebce76ec5 100644
--- a/lib/Lintian/Check/Fields/Derivatives.pm
+++ b/lib/Lintian/Check/Fields/Derivatives.pm
@@ -51,7 +51,8 @@ sub source {
                 'regexp' => qr/$regexp/,
                 'explanation' => $explanation,
             };
-        });
+        }
+    );
 
     foreach my $field ($DERIVATIVE_FIELDS->all) {
 
diff --git a/lib/Lintian/Check/Fields/Description.pm b/lib/Lintian/Check/Fields/Description.pm
index 1c39ac94af..2aa470a1ad 100644
--- a/lib/Lintian/Check/Fields/Description.pm
+++ b/lib/Lintian/Check/Fields/Description.pm
@@ -266,7 +266,8 @@ sub installable {
             $synopsis,
             $group->spelling_exceptions,
             $self->spelling_tag_emitter(
-                'spelling-error-in-description-synopsis'));
+                'spelling-error-in-description-synopsis')
+        );
         # Auto-generated dbgsym packages will use the package name in
         # their synopsis.  Unfortunately, some package names trigger a
         # capitalization error, such as "dbus" -> "D-Bus".  Therefore,
@@ -283,7 +284,8 @@ sub installable {
         check_spelling(
             $self->profile,$extended,
             $group->spelling_exceptions,
-            $self->spelling_tag_emitter('spelling-error-in-description'));
+            $self->spelling_tag_emitter('spelling-error-in-description')
+        );
         check_spelling_picky($self->profile, $extended,
             $self->spelling_tag_emitter('capitalization-error-in-description')
         );
diff --git a/lib/Lintian/Check/Fields/Length.pm b/lib/Lintian/Check/Fields/Length.pm
index 933f55d573..946f99b910 100644
--- a/lib/Lintian/Check/Fields/Length.pm
+++ b/lib/Lintian/Check/Fields/Length.pm
@@ -59,8 +59,7 @@ sub always {
 
     # longer than maximum
     my @long= grep {
-        length $self->processable->fields->untrimmed_value($_)
-          > $MAXIMUM_LENGTH
+        length $self->processable->fields->untrimmed_value($_)> $MAXIMUM_LENGTH
     }@all;
 
     # filter allowed fields
diff --git a/lib/Lintian/Check/Fields/MultiArch.pm b/lib/Lintian/Check/Fields/MultiArch.pm
index 07d6553308..72fbe0bf06 100644
--- a/lib/Lintian/Check/Fields/MultiArch.pm
+++ b/lib/Lintian/Check/Fields/MultiArch.pm
@@ -61,7 +61,9 @@ sub source {
                 safe_qx(
                     'dpkg-architecture', '--match-wildcard',
                     $wildcard,           '--list-known'
-                )));
+                )
+            )
+        );
 
         # include original wildcard
         push(@arches, $wildcard);
diff --git a/lib/Lintian/Check/Fields/PackageRelations.pm b/lib/Lintian/Check/Fields/PackageRelations.pm
index efdd63cae6..0a14c6ff57 100644
--- a/lib/Lintian/Check/Fields/PackageRelations.pm
+++ b/lib/Lintian/Check/Fields/PackageRelations.pm
@@ -185,7 +185,7 @@ sub installable {
             $self->hint('virtual-package-depends-without-real-package-depends',
                 "$field: $alternatives[0][0]")
               if (
-                   $VIRTUAL_PACKAGES->recognizes($alternatives[0][0])
+                $VIRTUAL_PACKAGES->recognizes($alternatives[0][0])
                 && ($field eq 'Depends' || $field eq 'Pre-Depends')
                 && ($pkg ne 'base-files' || $alternatives[0][0] ne 'awk')
                 # ignore phpapi- dependencies as adding an
@@ -224,7 +224,8 @@ sub installable {
                 $self->hint('obsolete-relation-form', "$field: $part_d_orig")
                   if (
                     $d_version && any { $d_version->[0] eq $_ }
-                    ('<', '>'));
+                    ('<', '>')
+                  );
 
                 $self->hint('bad-version-in-relation', "$field: $part_d_orig")
                   if ($d_version->[0] && !version_check($d_version->[1]));
@@ -337,10 +338,11 @@ sub installable {
                 # the Java Core API.
                 $self->hint('depends-on-specific-java-doc-package',$field)
                   if (
-                       $is_dep_field
+                    $is_dep_field
                     && $pkg ne 'default-jdk-doc'
                     && (   $d_pkg eq 'classpath-doc'
-                        || $d_pkg =~ /openjdk-\d+-doc/));
+                        || $d_pkg =~ /openjdk-\d+-doc/)
+                  );
 
                 if ($javalib && $field eq 'Depends'){
                     foreach my $reg (@known_java_pkg){
@@ -506,7 +508,8 @@ sub source {
                             ->is_release_architecture(
                                 $arch)
                             && !$self->profile->architectures->is_wildcard(
-                                $arch));
+                                $arch)
+                          );
                     }
 
                     for my $restrlist (@{$d_restr}) {
@@ -631,7 +634,8 @@ sub source {
     my @to_check = (
         ['Build-Depends'],
         ['Build-Depends', 'Build-Depends-Indep'],
-        ['Build-Depends', 'Build-Depends-Arch']);
+        ['Build-Depends', 'Build-Depends-Arch']
+    );
 
     for my $fields (@to_check) {
         my $relation = Lintian::Relation->new->logical_and(
@@ -641,7 +645,8 @@ sub source {
 
             $self->hint(
                 'redundant-build-prerequisites',
-                join(', ', sort @{$redundant_set}));
+                join(', ', sort @{$redundant_set})
+            );
         }
     }
 
diff --git a/lib/Lintian/Check/Fields/Section.pm b/lib/Lintian/Check/Fields/Section.pm
index e8eadce979..6d51f82fed 100644
--- a/lib/Lintian/Check/Fields/Section.pm
+++ b/lib/Lintian/Check/Fields/Section.pm
@@ -66,7 +66,8 @@ sub always {
         qr/\s*=>\s*/,
         sub {
             return {'regex' =>  qr/$_[0]/x, 'section' => $_[1]};
-        });
+        }
+    );
 
     my $section = $self->processable->fields->unfolded_value('Section');
 
diff --git a/lib/Lintian/Check/Fields/Vcs.pm b/lib/Lintian/Check/Fields/Vcs.pm
index 769670d2d5..3e97f37ce0 100644
--- a/lib/Lintian/Check/Fields/Vcs.pm
+++ b/lib/Lintian/Check/Fields/Vcs.pm
@@ -221,7 +221,8 @@ sub always {
         sub {
             my @ret = split(m{,}, $_[1]);
             return \@ret;
-        });
+        }
+    );
 
     my %seen_vcs;
     for my $platform (keys %VCS_EXTRACT) {
diff --git a/lib/Lintian/Check/Files/Architecture.pm b/lib/Lintian/Check/Files/Architecture.pm
index de41e5f7d9..4ba0b60ef9 100644
--- a/lib/Lintian/Check/Files/Architecture.pm
+++ b/lib/Lintian/Check/Files/Architecture.pm
@@ -41,7 +41,8 @@ has TRIPLETS => (
           keys %{$DEB_HOST_MULTIARCH};
 
         return \%triplets;
-    });
+    }
+);
 
 has depends_on_architecture => (is => 'rw', default => 0);
 
diff --git a/lib/Lintian/Check/Files/Banned.pm b/lib/Lintian/Check/Files/Banned.pm
index a1907fd5d4..81c1d20cc2 100644
--- a/lib/Lintian/Check/Files/Banned.pm
+++ b/lib/Lintian/Check/Files/Banned.pm
@@ -62,7 +62,8 @@ sub _md5sum_based_lintian_data {
                 'reason' => $reason,
                 'link'   => $link,
             };
-        });
+        }
+    );
 }
 
 has NON_DISTRIBUTABLE_FILES => (
@@ -73,7 +74,8 @@ has NON_DISTRIBUTABLE_FILES => (
 
         return $self->_md5sum_based_lintian_data(
             'cruft/non-distributable-files');
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Files/Banned/Lenna.pm b/lib/Lintian/Check/Files/Banned/Lenna.pm
index fa5f14e48c..c1d5751b83 100644
--- a/lib/Lintian/Check/Files/Banned/Lenna.pm
+++ b/lib/Lintian/Check/Files/Banned/Lenna.pm
@@ -54,8 +54,10 @@ has LENNA_BLACKLIST => (
                     'name'   => $name,
                     'link'   => $link,
                 };
-            });
-    });
+            }
+        );
+    }
+);
 
 # known good files
 has LENNA_WHITELIST => (
@@ -65,7 +67,8 @@ has LENNA_WHITELIST => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/banned/lenna/whitelist');
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
@@ -74,7 +77,7 @@ sub visit_patched_files {
       unless $item->is_file;
 
     return
-         unless $item->file_info =~ /\bimage\b/i
+      unless $item->file_info =~ /\bimage\b/i
       || $item->file_info =~ /^Matlab v\d+ mat/i
       || $item->file_info =~ /\bbitmap\b/i
       || $item->file_info =~ /^PDF Document\b/i
diff --git a/lib/Lintian/Check/Files/BuildPath.pm b/lib/Lintian/Check/Files/BuildPath.pm
index 78aa75a95b..ad839c2063 100644
--- a/lib/Lintian/Check/Files/BuildPath.pm
+++ b/lib/Lintian/Check/Files/BuildPath.pm
@@ -37,7 +37,8 @@ has BUILD_PATH_REGEX => (
 
         return $self->profile->load_data('files/build-path-regex',qr/~~~~~/,
             sub { return  qr/$_[0]/xsm;});
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/Compressed.pm b/lib/Lintian/Check/Files/Compressed.pm
index 7f7c72a0df..741af9b9cf 100644
--- a/lib/Lintian/Check/Files/Compressed.pm
+++ b/lib/Lintian/Check/Files/Compressed.pm
@@ -41,7 +41,8 @@ has COMPRESS_FILE_EXTENSIONS => (
 
         return $self->profile->load_data('files/compressed-file-extensions',
             qr/\s++/,sub { return qr/\Q$_[0]\E/ });
-    });
+    }
+);
 
 # an OR (|) regex of all compressed extension
 has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
@@ -55,7 +56,8 @@ has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
               $self->COMPRESS_FILE_EXTENSIONS->all);
 
         return qr/$text/;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/Compressed/Gz.pm b/lib/Lintian/Check/Files/Compressed/Gz.pm
index a493504929..5a96267db3 100644
--- a/lib/Lintian/Check/Files/Compressed/Gz.pm
+++ b/lib/Lintian/Check/Files/Compressed/Gz.pm
@@ -53,7 +53,8 @@ has changelog_timestamp => (
         }
 
         return 0;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/Compressed/Lz.pm b/lib/Lintian/Check/Files/Compressed/Lz.pm
index 5b7e280f6c..2d5dbaa601 100644
--- a/lib/Lintian/Check/Files/Compressed/Lz.pm
+++ b/lib/Lintian/Check/Files/Compressed/Lz.pm
@@ -44,7 +44,8 @@ has lzip_command => (
         my $command = first_value { locate_executable($_) } qw(lzip clzip);
 
         return $command;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/Contents.pm b/lib/Lintian/Check/Files/Contents.pm
index 8b6c626e21..9d20c0bdcf 100644
--- a/lib/Lintian/Check/Files/Contents.pm
+++ b/lib/Lintian/Check/Files/Contents.pm
@@ -66,7 +66,8 @@ has switched_locations => (
         }
 
         return \%switched_locations;
-    });
+    }
+);
 
 sub build_path {
     my ($self) = @_;
diff --git a/lib/Lintian/Check/Files/Date.pm b/lib/Lintian/Check/Files/Date.pm
index 2075ce9526..d49e573075 100644
--- a/lib/Lintian/Check/Files/Date.pm
+++ b/lib/Lintian/Check/Files/Date.pm
@@ -41,7 +41,8 @@ has ALLOWED_ANCIENT_FILES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/allowed-ancient-files');
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/EmptyPackage.pm b/lib/Lintian/Check/Files/EmptyPackage.pm
index a757909b38..57973edaab 100644
--- a/lib/Lintian/Check/Files/EmptyPackage.pm
+++ b/lib/Lintian/Check/Files/EmptyPackage.pm
@@ -39,7 +39,8 @@ has STANDARD_FILES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/standard-files');
-    });
+    }
+);
 
 has is_empty => (is => 'rw', default => 1);
 has is_dummy => (
@@ -54,7 +55,8 @@ has is_dummy => (
           || $self->processable->is_meta_package;
 
         return 0;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/IeeeData.pm b/lib/Lintian/Check/Files/IeeeData.pm
index 4d994d0128..4fab39928f 100644
--- a/lib/Lintian/Check/Files/IeeeData.pm
+++ b/lib/Lintian/Check/Files/IeeeData.pm
@@ -41,7 +41,8 @@ has COMPRESS_FILE_EXTENSIONS => (
 
         return $self->profile->load_data('files/compressed-file-extensions',
             qr/\s++/,sub { return qr/\Q$_[0]\E/ });
-    });
+    }
+);
 
 # an OR (|) regex of all compressed extension
 has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
@@ -55,7 +56,8 @@ has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
               $self->COMPRESS_FILE_EXTENSIONS->all);
 
         return qr/$text/;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/Init.pm b/lib/Lintian/Check/Files/Init.pm
index 6b9b3f0b7c..d8aa2b8049 100644
--- a/lib/Lintian/Check/Files/Init.pm
+++ b/lib/Lintian/Check/Files/Init.pm
@@ -48,7 +48,8 @@ sub visit_installed_files {
     $self->hint(
         'non-standard-file-permissions-for-etc-init.d-script',$file->name,
         $file->octal_permissions, $NOT_EQUAL,
-        sprintf('%04o', $EXECUTABLE_PERMISSIONS))
+        sprintf('%04o', $EXECUTABLE_PERMISSIONS)
+      )
       if $file->name =~ m{^etc/init\.d/\S}
       && $file->name !~ m{^etc/init\.d/(?:README|skeleton)$}
       && $file->operm != $EXECUTABLE_PERMISSIONS
diff --git a/lib/Lintian/Check/Files/Locales.pm b/lib/Lintian/Check/Files/Locales.pm
index 01b805dfaf..cc4e329b38 100644
--- a/lib/Lintian/Check/Files/Locales.pm
+++ b/lib/Lintian/Check/Files/Locales.pm
@@ -36,7 +36,8 @@ has LOCALE_CODES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/locale-codes', qr/\s++/);
-    });
+    }
+);
 
 has INCORRECT_LOCALE_CODES => (
     is => 'rw',
@@ -46,7 +47,8 @@ has INCORRECT_LOCALE_CODES => (
 
         return $self->profile->load_data('files/incorrect-locale-codes',
             qr/\s++/);
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/MultiArch.pm b/lib/Lintian/Check/Files/MultiArch.pm
index 59a7ff48e4..a58e57c98f 100644
--- a/lib/Lintian/Check/Files/MultiArch.pm
+++ b/lib/Lintian/Check/Files/MultiArch.pm
@@ -41,7 +41,8 @@ has TRIPLETS => (
           keys %{$DEB_HOST_MULTIARCH};
 
         return \%triplets;
-    });
+    }
+);
 
 my %PATH_DIRECTORIES = map { $_ => 1 } qw(
   bin/ sbin/ usr/bin/ usr/sbin/ usr/games/ );
diff --git a/lib/Lintian/Check/Files/NonFree.pm b/lib/Lintian/Check/Files/NonFree.pm
index a8f179aaa4..a75d5879c9 100644
--- a/lib/Lintian/Check/Files/NonFree.pm
+++ b/lib/Lintian/Check/Files/NonFree.pm
@@ -62,7 +62,8 @@ sub _md5sum_based_lintian_data {
                 'reason' => $reason,
                 'link'   => $link,
             };
-        });
+        }
+    );
 }
 
 has NON_FREE_FILES => (
@@ -72,7 +73,8 @@ has NON_FREE_FILES => (
         my ($self) = @_;
 
         return $self->_md5sum_based_lintian_data('cruft/non-free-files');
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Files/ObsoletePaths.pm b/lib/Lintian/Check/Files/ObsoletePaths.pm
index dc834678a5..9b7fd4bc69 100644
--- a/lib/Lintian/Check/Files/ObsoletePaths.pm
+++ b/lib/Lintian/Check/Files/ObsoletePaths.pm
@@ -55,8 +55,10 @@ has OBSOLETE_PATHS => (
                     'match' => qr/$_[0]/x,
                     'olddir' => $_[0],
                 };
-            });
-    });
+            }
+        );
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/P11Kit.pm b/lib/Lintian/Check/Files/P11Kit.pm
index 751d3c56c8..5c2acc8822 100644
--- a/lib/Lintian/Check/Files/P11Kit.pm
+++ b/lib/Lintian/Check/Files/P11Kit.pm
@@ -33,7 +33,7 @@ sub visit_installed_files {
     my ($self, $file) = @_;
 
     if (
-           $file->name =~ m{^usr/share/p11-kit/modules/.}
+        $file->name =~ m{^usr/share/p11-kit/modules/.}
         && $file->name !~ m{\A usr/share/p11-kit/modules/
                        [[:alnum:]][[:alnum:]_.-]*\.module\Z
                   }xsm
diff --git a/lib/Lintian/Check/Files/Permissions.pm b/lib/Lintian/Check/Files/Permissions.pm
index c370d08d46..7bfd6c4416 100644
--- a/lib/Lintian/Check/Files/Permissions.pm
+++ b/lib/Lintian/Check/Files/Permissions.pm
@@ -61,7 +61,8 @@ has component => (
         my ($self) = @_;
 
         return path($self->processable->path)->basename;
-    });
+    }
+);
 
 has linked_against_libvga => (
     is => 'rw',
@@ -87,7 +88,8 @@ has linked_against_libvga => (
         }
 
         return \%linked_against_libvga;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
@@ -95,7 +97,7 @@ sub visit_installed_files {
     if ($file->is_file) {
 
         if (
-               $file->is_executable
+            $file->is_executable
             && $file->identity eq 'root/games'
             && (   !$file->is_setgid
                 || !$file->all_bits_set($STANDARD_EXECUTABLE))
@@ -106,7 +108,8 @@ sub visit_installed_files {
                 $file->name,
                 $file->octal_permissions,
                 $NOT_EQUAL,
-                sprintf('%04o', $SET_GROUP_ID | $STANDARD_EXECUTABLE));
+                sprintf('%04o', $SET_GROUP_ID | $STANDARD_EXECUTABLE)
+            );
 
             return;
         }
@@ -132,14 +135,14 @@ sub visit_installed_files {
 
         # program is using svgalib
         return
-             if $file->is_setuid
+          if $file->is_setuid
           && !$file->is_setgid
           && $file->owner eq 'root'
           && exists $self->linked_against_libvga->{$file->name};
 
         # program is a setgid game
         return
-             if $file->is_setgid
+          if $file->is_setgid
           && !$file->is_setuid
           && $file->group eq 'games'
           && $file->name =~ m{^ usr/ (?:lib/)? games/ \S+ }msx;
@@ -167,7 +170,7 @@ sub visit_installed_files {
 
             # game data
             return
-                 if $file->operm == $GAME_DATA
+              if $file->operm == $GAME_DATA
               && $file->identity eq 'root/games'
               && $file->name =~ m{^ var/ (?:lib/)? games/ \S+ }msx;
 
@@ -210,26 +213,26 @@ sub visit_installed_files {
 
         # game directory with setgid bit
         return
-             if $file->operm == $GAME_FOLDER
+          if $file->operm == $GAME_FOLDER
           && $file->identity eq 'root/games'
           && $file->name =~ m{^ var/ (?:lib/)? games/ \S+ }msx;
 
         # shipping files here triggers warnings elsewhere
         return
-             if $file->operm == $VAR_LOCK_FOLDER
+          if $file->operm == $VAR_LOCK_FOLDER
           && $file->identity eq 'root/root'
           && ( $file->name =~ m{^ (?:var/)? tmp/ }msx
             || $file->name eq 'var/lock/');
 
         # shipping files here triggers warnings elsewhere
         return
-             if $file->operm == $VAR_LOCAL_FOLDER
+          if $file->operm == $VAR_LOCAL_FOLDER
           && $file->identity eq 'root/staff'
           && $file->name eq 'var/local/';
 
         # /usr/src created by base-files
         return
-             if $file->operm == $USR_SRC_FOLDER
+          if $file->operm == $USR_SRC_FOLDER
           && $file->identity eq 'root/src'
           && $file->name eq 'usr/src/';
 
diff --git a/lib/Lintian/Check/Files/Pkgconfig.pm b/lib/Lintian/Check/Files/Pkgconfig.pm
index 7c7950ead9..d2901a5abf 100644
--- a/lib/Lintian/Check/Files/Pkgconfig.pm
+++ b/lib/Lintian/Check/Files/Pkgconfig.pm
@@ -44,7 +44,8 @@ has PKG_CONFIG_BAD_REGEX => (
 
         return $self->profile->load_data('files/pkg-config-bad-regex',
             qr/~~~~~/,sub { return  qr/$_[0]/xsm;});
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/PrivacyBreach.pm b/lib/Lintian/Check/Files/PrivacyBreach.pm
index f2bbd369a8..ba9f28096e 100644
--- a/lib/Lintian/Check/Files/PrivacyBreach.pm
+++ b/lib/Lintian/Check/Files/PrivacyBreach.pm
@@ -68,8 +68,10 @@ has PRIVACY_BREAKER_WEBSITES => (
                     $ret{'suggest'} = $suggest;
                 }
                 return \%ret;
-            });
-    });
+            }
+        );
+    }
+);
 
 has PRIVACY_BREAKER_FRAGMENTS => (
     is => 'rw',
@@ -87,8 +89,10 @@ has PRIVACY_BREAKER_FRAGMENTS => (
                     'regex' => qr/$regex/xsm,
                     'tag' => $tag,
                 };
-            });
-    });
+            }
+        );
+    }
+);
 
 has PRIVACY_BREAKER_TAG_ATTR => (
     is => 'rw',
@@ -112,8 +116,10 @@ has PRIVACY_BREAKER_TAG_ATTR => (
                     'keywords' => \@keywordlist,
                     'regex' => qr/$regex/xsm,
                 };
-            });
-    });
+            }
+        );
+    }
+);
 
 sub detect_privacy_breach {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Files/SymbolicLinks.pm b/lib/Lintian/Check/Files/SymbolicLinks.pm
index 9b9cee0179..56f5d36a71 100644
--- a/lib/Lintian/Check/Files/SymbolicLinks.pm
+++ b/lib/Lintian/Check/Files/SymbolicLinks.pm
@@ -45,7 +45,8 @@ has COMPRESS_FILE_EXTENSIONS => (
 
         return $self->profile->load_data('files/compressed-file-extensions',
             qr/\s++/,sub { return qr/\Q$_[0]\E/ });
-    });
+    }
+);
 
 # an OR (|) regex of all compressed extension
 has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
@@ -59,7 +60,8 @@ has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
               $self->COMPRESS_FILE_EXTENSIONS->all);
 
         return qr/$text/;
-    });
+    }
+);
 
 sub visit_patched_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Files/Vcs.pm b/lib/Lintian/Check/Files/Vcs.pm
index 1e183a4203..3dddfb552a 100644
--- a/lib/Lintian/Check/Files/Vcs.pm
+++ b/lib/Lintian/Check/Files/Vcs.pm
@@ -41,7 +41,8 @@ has COMPRESS_FILE_EXTENSIONS => (
 
         return $self->profile->load_data('files/compressed-file-extensions',
             qr/\s++/,sub { return qr/\Q$_[0]\E/ });
-    });
+    }
+);
 
 # an OR (|) regex of all compressed extension
 has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
@@ -55,7 +56,8 @@ has COMPRESS_FILE_EXTENSIONS_OR_ALL => (
               $self->COMPRESS_FILE_EXTENSIONS->all);
 
         return qr/$text/;
-    });
+    }
+);
 
 # vcs control files
 has VCS_FILES => (
@@ -72,8 +74,10 @@ has VCS_FILES => (
                 my $regexp = $_[0];
                 $regexp=~ s/\$[{]COMPRESS_EXT[}]/$regex/g;
                 return qr/(?:$regexp)/x;
-            });
-    });
+            }
+        );
+    }
+);
 
 # an OR (|) regex of all vcs files
 has VCS_FILES_OR_ALL => (
@@ -85,7 +89,8 @@ has VCS_FILES_OR_ALL => (
         my $text = join($VERTICAL_BAR,
             map { $self->VCS_FILES->value($_) } $self->VCS_FILES->all);
         return qr/$text/;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $file) = @_;
diff --git a/lib/Lintian/Check/Fonts.pm b/lib/Lintian/Check/Fonts.pm
index 68e6052938..b7b9649e64 100644
--- a/lib/Lintian/Check/Fonts.pm
+++ b/lib/Lintian/Check/Fonts.pm
@@ -37,7 +37,8 @@ has FONT_PACKAGES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/fonts', qr/\s+/);
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/GroupChecks.pm b/lib/Lintian/Check/GroupChecks.pm
index 3b51d2b801..11f8fc8e9b 100644
--- a/lib/Lintian/Check/GroupChecks.pm
+++ b/lib/Lintian/Check/GroupChecks.pm
@@ -157,7 +157,8 @@ sub check_multiarch {
                     'dependency-is-not-multi-archified',
                     join(q{ },
                         $processable->name, 'depends on',
-                        $dep->name, "(multi-arch: $dma)"));
+                        $dep->name, "(multi-arch: $dma)")
+                );
             }
         }
     } elsif ($ma ne 'same'
diff --git a/lib/Lintian/Check/Images/Filenames.pm b/lib/Lintian/Check/Images/Filenames.pm
index b42b96020f..c612ee660f 100644
--- a/lib/Lintian/Check/Images/Filenames.pm
+++ b/lib/Lintian/Check/Images/Filenames.pm
@@ -29,7 +29,8 @@ use namespace::clean;
 
 with 'Lintian::Check';
 
-my @image_formats = ({
+my @image_formats = (
+    {
         name => 'PNG',
         file_info => qr/^PNG image data/,
         good_name => sub { $_[0] =~ /\.(?:png|PNG)$/ }
diff --git a/lib/Lintian/Check/InitD.pm b/lib/Lintian/Check/InitD.pm
index 2f63cb9472..d504ab9ad0 100644
--- a/lib/Lintian/Check/InitD.pm
+++ b/lib/Lintian/Check/InitD.pm
@@ -405,7 +405,7 @@ sub check_init {
         }
 
         if (
-               $l =~ m{^\s*\.\s+/lib/lsb/init-functions}
+            $l =~ m{^\s*\.\s+/lib/lsb/init-functions}
             && !$processable->relation('strong')->satisfies('lsb-base')
             && none { $_->basename =~ m/\.service$/ && !$_->is_dir }
             @{$processable->installed->sorted_list}
@@ -537,8 +537,8 @@ sub check_init {
       = $self->profile->load_data('init.d/virtual_facilities');
 
     # Check syntax rules that apply to all of the keywords.
-    for my $keyword (qw(required-start should-start required-stop should-stop))
-    {
+    for
+      my $keyword (qw(required-start should-start required-stop should-stop)){
         next unless defined $lsb{$keyword};
         for my $dependency (split(/\s+/, $lsb{$keyword})) {
             if (defined $implied_dependencies{$dependency}) {
diff --git a/lib/Lintian/Check/Languages/Fortran/Gfortran.pm b/lib/Lintian/Check/Languages/Fortran/Gfortran.pm
index 5b203e4261..92aa9bf6be 100644
--- a/lib/Lintian/Check/Languages/Fortran/Gfortran.pm
+++ b/lib/Lintian/Check/Languages/Fortran/Gfortran.pm
@@ -46,12 +46,12 @@ sub visit_installed_files {
 
     # do not look at flang, grub or libreoffice modules
     return
-         if $file->name =~ m{/flang-\d+/}
+      if $file->name =~ m{/flang-\d+/}
       || $file->name =~ m{^usr/lib/grub}
       || $file->name =~ m{^usr/lib/libreoffice};
 
     return
-         unless $file->is_file
+      unless $file->is_file
       && $file->is_open_ok
       && $file->file_info =~ /\bgzip compressed\b/;
 
diff --git a/lib/Lintian/Check/Languages/Java.pm b/lib/Lintian/Check/Languages/Java.pm
index ac820bc6e8..d544ef992d 100644
--- a/lib/Lintian/Check/Languages/Java.pm
+++ b/lib/Lintian/Check/Languages/Java.pm
@@ -175,8 +175,9 @@ sub installable {
                #   these do not ship classes but java files and other sources.
                # Javadoc jars deployed in the Maven repository also do not ship
                #   classes but HTML files, images and CSS files
-                if ((
-                           $bsname !~ m/\.source$/
+                if (
+                    (
+                        $bsname !~ m/\.source$/
                         && $file->name
                         !~ m{^usr/share/maven-repo/.*-javadoc\.jar}
                         && $file->name !~ m{\.doc(?:\.(?:user|isv))?_[^/]+.jar}
@@ -226,7 +227,8 @@ sub installable {
 
             $self->hint(
                 'classpath-contains-relative-path',
-                $file->name . ': ' . join(', ', @relative))if @relative;
+                $file->name . ': ' . join(', ', @relative)
+            )if @relative;
         }
 
         if (   $has_public_jars
diff --git a/lib/Lintian/Check/Languages/Ocaml.pm b/lib/Lintian/Check/Languages/Ocaml.pm
index 4d61106dff..4b9e7d2067 100644
--- a/lib/Lintian/Check/Languages/Ocaml.pm
+++ b/lib/Lintian/Check/Languages/Ocaml.pm
@@ -65,7 +65,8 @@ has provided_o => (
         }
 
         return \%provided_o;
-    });
+    }
+);
 
 has is_lib_package => (
     is => 'rw',
@@ -78,7 +79,8 @@ has is_lib_package => (
           if $self->processable->name =~ /^lib/;
 
         return 0;
-    });
+    }
+);
 
 has is_dev_package => (
     is => 'rw',
@@ -101,7 +103,8 @@ has is_dev_package => (
           );
 
         return 0;
-    });
+    }
+);
 
 # for libraries outside /usr/lib/ocaml
 has outside_number => (is => 'rw', default => 0);
diff --git a/lib/Lintian/Check/Languages/Perl/Perl4/Prerequisites.pm b/lib/Lintian/Check/Languages/Perl/Perl4/Prerequisites.pm
index 509a2b92fa..59e234915c 100644
--- a/lib/Lintian/Check/Languages/Perl/Perl4/Prerequisites.pm
+++ b/lib/Lintian/Check/Languages/Perl/Perl4/Prerequisites.pm
@@ -53,7 +53,8 @@ has satisfies_perl4_prerequisites => (
 
         return $self->processable->relation('strong')
           ->satisfies($PERL4_PREREQUISITES);
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Languages/Python.pm b/lib/Lintian/Check/Languages/Python.pm
index e47bf7b68e..536466be9a 100644
--- a/lib/Lintian/Check/Languages/Python.pm
+++ b/lib/Lintian/Check/Languages/Python.pm
@@ -70,7 +70,8 @@ has ALLOWED_PYTHON_FILES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/allowed-python-files');
-    });
+    }
+);
 has GENERIC_PYTHON_MODULES => (
     is => 'rw',
     lazy => 1,
@@ -78,7 +79,8 @@ has GENERIC_PYTHON_MODULES => (
         my ($self) = @_;
 
         return $self->profile->load_data('files/generic-python-modules');
-    });
+    }
+);
 
 my @VERSION_FIELDS = qw(X-Python-Version XS-Python-Version X-Python3-Version);
 
@@ -148,7 +150,8 @@ sub source {
             ['\d+\.\d+', '\d+\.\d+'],['\d+\.\d+'],
             ['\>=\s*\d+\.\d+', '\<\<\s*\d+\.\d+'],['\>=\s*\d+\.\d+'],
             ['current', '\>=\s*\d+\.\d+'],['current'],
-            ['all']);
+            ['all']
+        );
 
         my @pyversion = split(/\s*,\s*/, $pyversion);
 
@@ -165,12 +168,14 @@ sub source {
             for my $rule (@valid) {
                 if (
                     $pyversion[0] =~ /^$rule->[0]$/
-                    && ((
-                               $pyversion[1]
+                    && (
+                        (
+                            $pyversion[1]
                             && $rule->[1]
                             && $pyversion[1] =~ /^$rule->[1]$/
                         )
-                        || (!$pyversion[1] && !$rule->[1]))
+                        || (!$pyversion[1] && !$rule->[1])
+                    )
                 ) {
                     $okay = 1;
                     last;
diff --git a/lib/Lintian/Check/Libraries/Embedded.pm b/lib/Lintian/Check/Libraries/Embedded.pm
index 024e09ba35..6c123e1796 100644
--- a/lib/Lintian/Check/Libraries/Embedded.pm
+++ b/lib/Lintian/Check/Libraries/Embedded.pm
@@ -77,8 +77,10 @@ has EMBEDDED_LIBRARIES => (
                 $result{source} //= $label;
 
                 return \%result;
-            });
-    });
+            }
+        );
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Libraries/Shared/Links.pm b/lib/Lintian/Check/Libraries/Shared/Links.pm
index 78a296f97c..2481a55e43 100644
--- a/lib/Lintian/Check/Libraries/Shared/Links.pm
+++ b/lib/Lintian/Check/Libraries/Shared/Links.pm
@@ -55,7 +55,8 @@ has development_packages => (
         }
 
         return \@development_packages;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Libraries/Shared/MultiArch.pm b/lib/Lintian/Check/Libraries/Shared/MultiArch.pm
index 25b8b15687..4aab77a42a 100644
--- a/lib/Lintian/Check/Libraries/Shared/MultiArch.pm
+++ b/lib/Lintian/Check/Libraries/Shared/MultiArch.pm
@@ -66,7 +66,8 @@ sub installable {
 
     $self->hint(
         'shared-library-is-multi-arch-foreign',
-        sort +uniq @{$self->shared_libraries})
+        sort +uniq @{$self->shared_libraries}
+      )
       if @{$self->shared_libraries}
       && $self->processable->fields->value('Multi-Arch') eq 'foreign';
 
diff --git a/lib/Lintian/Check/Libraries/Shared/Soname.pm b/lib/Lintian/Check/Libraries/Shared/Soname.pm
index 8d2520b252..4f149f36db 100644
--- a/lib/Lintian/Check/Libraries/Shared/Soname.pm
+++ b/lib/Lintian/Check/Libraries/Shared/Soname.pm
@@ -45,7 +45,8 @@ has DEB_HOST_MULTIARCH => (
         my ($self) = @_;
 
         return $self->profile->architectures->deb_host_multiarch;
-    });
+    }
+);
 
 sub installable {
     my ($self) = @_;
diff --git a/lib/Lintian/Check/Libraries/Shared/Trigger/Ldconfig.pm b/lib/Lintian/Check/Libraries/Shared/Trigger/Ldconfig.pm
index 499752b29c..809279444c 100644
--- a/lib/Lintian/Check/Libraries/Shared/Trigger/Ldconfig.pm
+++ b/lib/Lintian/Check/Libraries/Shared/Trigger/Ldconfig.pm
@@ -49,7 +49,8 @@ has soname_by_file => (
         }
 
         return \%soname_by_file;
-    });
+    }
+);
 
 has must_call_ldconfig => (is => 'rw', default => sub { [] });
 
diff --git a/lib/Lintian/Check/Libraries/Static.pm b/lib/Lintian/Check/Libraries/Static.pm
index f335f022e6..8b1e4367d7 100644
--- a/lib/Lintian/Check/Libraries/Static.pm
+++ b/lib/Lintian/Check/Libraries/Static.pm
@@ -86,7 +86,7 @@ sub visit_installed_files {
     }
 
     $self->hint('unstripped-static-library', $item->name,
-            $LEFT_PARENTHESIS
+        $LEFT_PARENTHESIS
           . join($SPACE, sort +uniq @unstripped_members)
           . $RIGHT_PARENTHESIS)
       if @unstripped_members
diff --git a/lib/Lintian/Check/MaintainerScripts/AncientVersion.pm b/lib/Lintian/Check/MaintainerScripts/AncientVersion.pm
index 26f08fa020..4cb7ffade8 100644
--- a/lib/Lintian/Check/MaintainerScripts/AncientVersion.pm
+++ b/lib/Lintian/Check/MaintainerScripts/AncientVersion.pm
@@ -67,7 +67,8 @@ has old_versions => (
         }
 
         return \%old_versions;
-    });
+    }
+);
 
 sub visit_control_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/MaintainerScripts/Diversion.pm b/lib/Lintian/Check/MaintainerScripts/Diversion.pm
index 59ac7a4cd7..a8f8bc0243 100644
--- a/lib/Lintian/Check/MaintainerScripts/Diversion.pm
+++ b/lib/Lintian/Check/MaintainerScripts/Diversion.pm
@@ -182,8 +182,10 @@ sub installable {
     # diversion name normalise them all
     if ($self->expand_diversions) {
 
-        for my $divert (keys %{$self->removed_diversions},
-            keys %{$self->added_diversions}) {
+        for my $divert (
+            keys %{$self->removed_diversions},
+            keys %{$self->added_diversions}
+        ) {
 
             # if a wider regex was found, the entries might no longer be there
             next
@@ -211,7 +213,8 @@ sub installable {
                 }
             } (
                 keys %{$self->removed_diversions},
-                keys %{$self->added_diversions});
+                keys %{$self->added_diversions}
+            );
 
             # replace all the occurrences with the widest regex:
             for my $k (@matches) {
@@ -302,7 +305,8 @@ sub installable {
             $self->hint('diversion-for-unknown-file', $unquoted, $pointer)
               unless (
                 any { /$divertrx/ }
-                @{$self->processable->installed->sorted_list});
+                @{$self->processable->installed->sorted_list}
+              );
 
         } else {
             $self->hint('diversion-for-unknown-file', $unquoted, $pointer)
diff --git a/lib/Lintian/Check/MenuFormat.pm b/lib/Lintian/Check/MenuFormat.pm
index 591f556070..21d902c4ae 100644
--- a/lib/Lintian/Check/MenuFormat.pm
+++ b/lib/Lintian/Check/MenuFormat.pm
@@ -99,7 +99,8 @@ has MENU_SECTIONS => (
 
         return $self->profile->load_data('menu-format/menu-sections',qr{/},
             \&_menu_sections);
-    });
+    }
+);
 
 # Authoritative source of desktop keys:
 # https://specifications.freedesktop.org/desktop-entry-spec/latest/
@@ -115,7 +116,8 @@ has KNOWN_DESKTOP_KEYS => (
         my ($self) = @_;
 
         return $self->profile->load_data('menu-format/known-desktop-keys');
-    });
+    }
+);
 
 has DEPRECATED_DESKTOP_KEYS => (
     is => 'rw',
@@ -125,7 +127,8 @@ has DEPRECATED_DESKTOP_KEYS => (
 
         return $self->profile->load_data(
             'menu-format/deprecated-desktop-keys');
-    });
+    }
+);
 
 # KDE uses some additional keys that should start with X-KDE but don't for
 # historical reasons.
@@ -136,7 +139,8 @@ has KDE_DESKTOP_KEYS => (
         my ($self) = @_;
 
         return $self->profile->load_data('menu-format/kde-desktop-keys');
-    });
+    }
+);
 
 # Known types of desktop entries.
 # https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
@@ -181,7 +185,8 @@ has ADD_CATEGORIES => (
         my ($self) = @_;
 
         return $self->profile->load_data('menu-format/add-categories');
-    });
+    }
+);
 
 # This is a list of Reserved Categories for .desktop files.  To use one of
 # these, the desktop entry must also have an OnlyShowIn key limiting the
@@ -561,7 +566,8 @@ sub verify_icon {
 
     my @packages = (
         $self->processable,
-        @{ $self->group->direct_dependencies($self->processable) });
+        @{ $self->group->direct_dependencies($self->processable) }
+    );
 
     my @candidates;
     for my $processable (@packages) {
@@ -673,7 +679,8 @@ sub verify_desktop_file {
                         [
                             'desktop-entry-contains-deprecated-key',
                             $pointer, $tag
-                        ]);
+                        ]
+                    );
                 }
             } elsif (not $self->KNOWN_DESKTOP_KEYS->recognizes($basetag)
                 and not $self->KDE_DESKTOP_KEYS->recognizes($basetag)
diff --git a/lib/Lintian/Check/Script/Syntax.pm b/lib/Lintian/Check/Script/Syntax.pm
index 759113c092..bd04300beb 100644
--- a/lib/Lintian/Check/Script/Syntax.pm
+++ b/lib/Lintian/Check/Script/Syntax.pm
@@ -42,7 +42,8 @@ const my $MAXIMUM_LINES_ANALYZED => 54;
 # exclude some shells. zsh -n is broken, see #485885
 const my %SYNTAX_CHECKERS => (
     sh => [qw{/bin/dash -n}],
-    bash => [qw{/bin/bash -n}]);
+    bash => [qw{/bin/bash -n}]
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Scripts.pm b/lib/Lintian/Check/Scripts.pm
index 905c40d26c..bbe9cabebc 100644
--- a/lib/Lintian/Check/Scripts.pm
+++ b/lib/Lintian/Check/Scripts.pm
@@ -87,10 +87,12 @@ has INTERPRETERS => (
                     folder => $folder,
                     prerequisites => $prerequisites
                 };
-            });
+            }
+        );
 
         return $unversioned;
-    });
+    }
+);
 
 # The more complex case of interpreters that may have a version number.
 #
@@ -156,10 +158,12 @@ has VERSIONED_INTERPRETERS => (
                     template => $template,
                     versions => \@versions
                 };
-            });
+            }
+        );
 
         return $versioned;
-    });
+    }
+);
 
 # When detecting commands inside shell scripts, use this regex to match the
 # beginning of the command rather than checking whether the command is at the
@@ -211,8 +215,10 @@ has BAD_MAINTAINER_COMMANDS => (
                     script_include_regex => qr/$script_include_pattern/x,
                     command_pattern => $command_pattern,
                 };
-            });
-    });
+            }
+        );
+    }
+);
 
 # Appearance of one of these regexes in a maintainer script means that there
 # must be a dependency (or pre-dependency) on the given package.  The tag
@@ -242,7 +248,8 @@ has all_prerequisites => (
             $self->processable->name);
 
         return $all_prerequisites;
-    });
+    }
+);
 
 has strong_prerequisites => (
     is => 'rw',
@@ -253,7 +260,8 @@ has strong_prerequisites => (
         my $strong_prerequisites = $self->processable->relation('strong');
 
         return $strong_prerequisites;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
@@ -552,14 +560,16 @@ sub visit_installed_files {
 
             } elsif ($basename =~ /^(python\d|ruby|[mg]awk)$/) {
 
-                $self->hint((
-                    "$basename-script-but-no-$basename-dep",
-                    $item->interpreter,
-                    $LEFT_SQUARE_BRACKET
-                      . $item->name
-                      . $RIGHT_SQUARE_BRACKET,
-                    "(does not satisfy $depends)"
-                ));
+                $self->hint(
+                    (
+                        "$basename-script-but-no-$basename-dep",
+                        $item->interpreter,
+                        $LEFT_SQUARE_BRACKET
+                          . $item->name
+                          . $RIGHT_SQUARE_BRACKET,
+                        "(does not satisfy $depends)"
+                    )
+                );
 
             } elsif ($basename eq 'csh'
                 && $item->name =~ m{^etc/csh/login\.d/}){
diff --git a/lib/Lintian/Check/Systemd.pm b/lib/Lintian/Check/Systemd.pm
index 07f51274d8..ad0e599161 100644
--- a/lib/Lintian/Check/Systemd.pm
+++ b/lib/Lintian/Check/Systemd.pm
@@ -95,7 +95,8 @@ has PROVIDED_BY_SYSTEMD => (
         my ($self) = @_;
 
         return $self->profile->load_data('systemd/init-whitelist');
-    });
+    }
+);
 
 # array of names provided by the service files.
 # This includes Alias= directives, so after parsing
@@ -143,11 +144,13 @@ sub visit_installed_files {
     push(@{$self->cron_scripts}, $item)
       if $item->dirname =~ m{^ etc/cron[.][^\/]+ / $}x;
 
-    if (   $item->dirname eq 'etc/init.d/'
+    if (
+        $item->dirname eq 'etc/init.d/'
         && !$item->is_dir
         && (none { $item->basename eq $_} qw{README skeleton rc rcS})
         && $self->processable->name ne 'initscripts'
-        && $item->link ne 'lib/init/upstart-job') {
+        && $item->link ne 'lib/init/upstart-job'
+    ) {
 
         unless ($item->is_file) {
 
diff --git a/lib/Lintian/Check/Systemd/Native/Prerequisites.pm b/lib/Lintian/Check/Systemd/Native/Prerequisites.pm
index e5bebf9de6..87e24c5e69 100644
--- a/lib/Lintian/Check/Systemd/Native/Prerequisites.pm
+++ b/lib/Lintian/Check/Systemd/Native/Prerequisites.pm
@@ -49,7 +49,8 @@ has satisfies_systemd_native_prerequisites => (
         my $pre_depends = $self->processable->relation('Pre-Depends');
 
         return $pre_depends->satisfies($SYSTEMD_NATIVE_PREREQUISITES);
-    });
+    }
+);
 
 sub visit_control_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Team/PkgJs/Deprecated.pm b/lib/Lintian/Check/Team/PkgJs/Deprecated.pm
index 0fd0daa09f..6ea572beec 100644
--- a/lib/Lintian/Check/Team/PkgJs/Deprecated.pm
+++ b/lib/Lintian/Check/Team/PkgJs/Deprecated.pm
@@ -45,7 +45,8 @@ has javascript_team_maintained => (
           =~ /pkg-javascript-maintainers\@lists\.alioth\.debian\.org/;
 
         return 0;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Team/PkgPerl/XsAbi.pm b/lib/Lintian/Check/Team/PkgPerl/XsAbi.pm
index 1488ab1bd5..b5dae5a1c1 100644
--- a/lib/Lintian/Check/Team/PkgPerl/XsAbi.pm
+++ b/lib/Lintian/Check/Team/PkgPerl/XsAbi.pm
@@ -68,7 +68,8 @@ has relies_on_modern_api => (
           if version_compare_relation($api_version, REL_GE, '5.19.11');
 
         return 0;
-    });
+    }
+);
 
 sub visit_installed_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Triggers.pm b/lib/Lintian/Check/Triggers.pm
index 25dc3172be..f20f0099b8 100644
--- a/lib/Lintian/Check/Triggers.pm
+++ b/lib/Lintian/Check/Triggers.pm
@@ -66,8 +66,10 @@ has TRIGGER_TYPES => (
                   && !$trigger_types{await};
 
                 return \%trigger_types;
-            });
-    });
+            }
+        );
+    }
+);
 
 sub visit_control_files {
     my ($self, $item) = @_;
diff --git a/lib/Lintian/Check/Udev.pm b/lib/Lintian/Check/Udev.pm
index b1adb27348..9e424513e9 100644
--- a/lib/Lintian/Check/Udev.pm
+++ b/lib/Lintian/Check/Udev.pm
@@ -83,11 +83,13 @@ sub check_rule {
         && $rule !~ m/ENV\{ID_SOFTWARE_RADIO\}/
         && $rule !~ m/TAG\+="uaccess"/
     ) {
-        $self->hint((
-            'udev-rule-missing-uaccess',
-            "$file:$linenum",
-            'user accessible device missing TAG+="uaccess"'
-        ));
+        $self->hint(
+            (
+                'udev-rule-missing-uaccess',
+                "$file:$linenum",
+                'user accessible device missing TAG+="uaccess"'
+            )
+        );
     }
 
     # Matching rules mentioning vendor/product should also specify
@@ -96,11 +98,13 @@ sub check_rule {
         && $rule =~ m/ATTR\{idProduct\}=="[0-9a-fA-F]*"/
         && !$in_goto
         && $rule !~ m/SUBSYSTEM=="[^"]+"/) {
-        $self->hint((
-            'udev-rule-missing-subsystem',
-            "$file:$linenum",
-            'vendor/product matching missing SUBSYSTEM specifier'
-        ));
+        $self->hint(
+            (
+                'udev-rule-missing-subsystem',
+                "$file:$linenum",
+                'vendor/product matching missing SUBSYSTEM specifier'
+            )
+        );
     }
 
     return 0;
diff --git a/lib/Lintian/Data.pm b/lib/Lintian/Data.pm
index cf8f7eefb0..45bd7d0c3e 100644
--- a/lib/Lintian/Data.pm
+++ b/lib/Lintian/Data.pm
@@ -110,12 +110,14 @@ is a hashref, new keys can be inserted etc.
 has dataset => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has keyorder => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 =item all
 
diff --git a/lib/Lintian/Data/Architectures.pm b/lib/Lintian/Data/Architectures.pm
index 0089568e77..48d7c14134 100644
--- a/lib/Lintian/Data/Architectures.pm
+++ b/lib/Lintian/Data/Architectures.pm
@@ -98,7 +98,8 @@ has deb_host_multiarch => (
           for keys %{$self->host_variables};
 
         return \%deb_host_multiarch;
-    });
+    }
+);
 
 # The list of directories searched by default by the dynamic linker.
 # Packages installing shared libraries into these directories must call
@@ -138,7 +139,8 @@ has ldconfig_folders => (
         my @with_slash = map { $_ . $SLASH } @ldconfig_folders;
 
         return \@with_slash;
-    });
+    }
+);
 
 # Valid architecture wildcards.
 has wildcards => (
@@ -194,7 +196,8 @@ has wildcards => (
         }
 
         return \%wildcards;
-    });
+    }
+);
 
 # Maps aliases to the "original" arch name.
 # (e.g. "linux-amd64" => "amd64")
@@ -244,7 +247,8 @@ has names => (
         }
 
         return \%names;
-    });
+    }
+);
 
 =item is_wildcard ($wildcard)
 
@@ -329,7 +333,7 @@ sub valid_restriction {
     $restriction =~ s/^!//;
 
     return
-         $self->is_release_architecture($restriction)
+      $self->is_release_architecture($restriction)
       || $self->is_wildcard($restriction)
       || $restriction eq 'all';
 }
@@ -402,7 +406,9 @@ sub refresh {
         my @lines= split(
             /\n/,
             decode_utf8(
-                safe_qx(qw{dpkg-architecture --host-arch}, $architecture)));
+                safe_qx(qw{dpkg-architecture --host-arch}, $architecture)
+            )
+        );
 
         for my $line (@lines) {
             my ($key, $value) = split(/=/, $line, 2);
diff --git a/lib/Lintian/Data/Debhelper/Levels.pm b/lib/Lintian/Data/Debhelper/Levels.pm
index 7720a8bcd1..4d72851cf5 100644
--- a/lib/Lintian/Data/Debhelper/Levels.pm
+++ b/lib/Lintian/Data/Debhelper/Levels.pm
@@ -60,7 +60,8 @@ has location => (
 
 has separator => (
     is => 'rw',
-    default => sub { qr/=/ });
+    default => sub { qr/=/ }
+);
 
 has accumulator => (is => 'rw');
 
diff --git a/lib/Lintian/Data/Manual/References.pm b/lib/Lintian/Data/Manual/References.pm
index a1d925bd11..39f6966f26 100644
--- a/lib/Lintian/Data/Manual/References.pm
+++ b/lib/Lintian/Data/Manual/References.pm
@@ -64,7 +64,8 @@ has location => (
 
 has separator => (
     is => 'rw',
-    default => sub { qr/::/ });
+    default => sub { qr/::/ }
+);
 
 has accumulator => (
     is => 'rw',
@@ -87,7 +88,8 @@ has accumulator => (
 
             return \%entry;
         };
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Deb822/Parser.pm b/lib/Lintian/Deb822/Parser.pm
index cd2b057906..182d355b0a 100644
--- a/lib/Lintian/Deb822/Parser.pm
+++ b/lib/Lintian/Deb822/Parser.pm
@@ -33,13 +33,15 @@ use constant {
 
 our %EXPORT_TAGS = (constants =>
       [qw(DCTRL_DEBCONF_TEMPLATE DCTRL_NO_COMMENTS DCTRL_COMMENTS_AT_EOL)],);
-our @EXPORT_OK = (qw(
+our @EXPORT_OK = (
+    qw(
       visit_dpkg_paragraph_string
       parse_dpkg_control_string
       parse_dpkg_control_string_lc
       read_dpkg_control
       read_dpkg_control_lc
-      ), @{ $EXPORT_TAGS{constants} });
+    ), @{ $EXPORT_TAGS{constants} }
+);
 
 use Exporter qw(import);
 
diff --git a/lib/Lintian/Deb822/Section.pm b/lib/Lintian/Deb822/Section.pm
index edbaf89bed..471334a7bc 100644
--- a/lib/Lintian/Deb822/Section.pm
+++ b/lib/Lintian/Deb822/Section.pm
@@ -80,7 +80,8 @@ has legend => (
         $legend{lc $_} = $_ for keys %{$self->verbatim};
 
         return \%legend;
-    });
+    }
+);
 
 has verbatim => (is => 'rw', default => sub { {} });
 has unfolded => (is => 'rw', default => sub { {} });
diff --git a/lib/Lintian/Group.pm b/lib/Lintian/Group.pm
index e74d9f7e5e..7dc20aec20 100644
--- a/lib/Lintian/Group.pm
+++ b/lib/Lintian/Group.pm
@@ -229,7 +229,8 @@ sub process {
 
                         my @lines = (
                             $declared_overrides->{$dated}{$context}{line},
-                            $declared_overrides->{$modern}{$context}{line});
+                            $declared_overrides->{$modern}{$context}{line}
+                        );
                         $processable->hint('duplicate-override-context',
                             $modern, 'lines', sort @lines);
 
@@ -336,7 +337,7 @@ sub process {
             my @sorted = sort { $a->name cmp $b->name } @matches;
 
             push(@crossing,
-                    $hint->tag->name
+                $hint->tag->name
                   . $SPACE
                   . join($SPACE, map { $_->name } @sorted))
               if @sorted > 1;
@@ -526,7 +527,8 @@ sub add_processable {
             sprintf(
                 "warning: tainted %1\$s package '%2\$s', skipping\n",
                 $processable->type, $processable->name
-            ));
+            )
+        );
         return 0;
     }
 
@@ -777,7 +779,8 @@ has spelling_exceptions => (
         }
 
         return \%exceptions;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Index.pm b/lib/Lintian/Index.pm
index 5f9f8f4577..3bb64babd4 100644
--- a/lib/Lintian/Index.pm
+++ b/lib/Lintian/Index.pm
@@ -112,7 +112,8 @@ has catalog => (
         $catalog{$EMPTY} = $root;
 
         return \%catalog;
-    });
+    }
+);
 
 has basedir => (
     is => 'rw',
@@ -145,7 +146,8 @@ has sorted_list => (
         const my @IMMUTABLE => @sorted;
 
         return \@IMMUTABLE;
-    });
+    }
+);
 
 =item lookup (FILE)
 
@@ -200,8 +202,9 @@ sub create_from_basedir {
       or die encode_utf8('Cannot change to directory ' . $self->basedir);
 
     # get times in UTC
-    my @index_command
-      = ('env', 'TZ=UTC', 'find', '-printf', '%M %s %A+\0%p\0%l\0');
+    my @index_command= (
+        'env', 'TZ=UTC', 'find', '-printf', '%M %s %A+\0%p\0%l\0'
+    );
     my $index_output;
     my $index_errors;
 
@@ -351,7 +354,8 @@ sub load {
             $operm | (
                 $FILE_CODE2LPATH_TYPE{$raw_type}
                   // Lintian::Index::Item::TYPE_OTHER
-            ));
+            )
+        );
     }
 
     # find all entries that are not regular files
diff --git a/lib/Lintian/Index/FileInfo.pm b/lib/Lintian/Index/FileInfo.pm
index f0b634a3e3..9cf8f86ccd 100644
--- a/lib/Lintian/Index/FileInfo.pm
+++ b/lib/Lintian/Index/FileInfo.pm
@@ -114,7 +114,8 @@ sub add_fileinfo {
             }
 
             return;
-        });
+        }
+    );
 
     $_->file_info($fileinfo{$_->name}) for @files;
 
diff --git a/lib/Lintian/Index/Item.pm b/lib/Lintian/Index/Item.pm
index fa26114f60..f9c80cd3b7 100644
--- a/lib/Lintian/Index/Item.pm
+++ b/lib/Lintian/Index/Item.pm
@@ -127,7 +127,8 @@ my %T = (
     (map {sprintf('%o',$_) => chr} 0..($BYTE_MAXIMUM & $SINGLE_OCTAL_MASK)),
     (map {sprintf('%02o',$_) => chr} 0..($BYTE_MAXIMUM & $DUAL_OCTAL_MASK)),
     (map {sprintf('%03o',$_) => chr} 0..$BYTE_MAXIMUM),
-    (split //, "r\rn\nb\ba\af\ft\tv\013"));
+    (split //, "r\rn\nb\ba\af\ft\tv\013")
+);
 
 sub unescape_c_style {
     my ($escaped) = @_;
@@ -361,7 +362,8 @@ has hashbang => (
         $trimmed_bytes =~ s/^\s+|\s+$//g;
 
         return $trimmed_bytes;
-    });
+    }
+);
 
 =item interpreter_with_options
 
@@ -381,7 +383,8 @@ has interpreter_with_options => (
         $with_options =~ s{^/usr/bin/env\s+}{};
 
         return $with_options;
-    });
+    }
+);
 
 =item interpreter
 
@@ -401,7 +404,8 @@ has interpreter => (
         $interpreter =~ s/^(\S+).*/$1/;
 
         return $interpreter;
-    });
+    }
+);
 
 =item C<calls_env>
 
@@ -420,7 +424,8 @@ has calls_env => (
           if $self->hashbang =~ m{^/usr/bin/env\s+};
 
         return 0;
-    });
+    }
+);
 
 =item C<is_shell_script>
 
@@ -444,7 +449,8 @@ has is_shell_script => (
           if $basename =~ /^(?:[bd]?a|t?c|(?:pd|m)?k|z)?sh$/;
 
         return 0;
-    });
+    }
+);
 
 =item is_elf
 
@@ -462,7 +468,8 @@ has is_elf => (
           if $self->magic($ELF_MAGIC_SIZE) eq "\x7FELF";
 
         return 0;
-    });
+    }
+);
 
 =item is_script
 
@@ -484,7 +491,8 @@ has is_script => (
           unless $self->magic($SHELL_SCRIPT_MAGIC_SIZE) eq $HASHBANG;
 
         return 1;
-    });
+    }
+);
 
 =item is_maintainer_script
 
@@ -503,7 +511,8 @@ has is_maintainer_script => (
           && $self->is_open_ok;
 
         return 0;
-    });
+    }
+);
 
 =item identity
 
@@ -743,7 +752,8 @@ has link_normalized => (
         my $target = normalize_link_target($dir, $link);
 
         return $target;
-    });
+    }
+);
 
 =item is_readable
 
@@ -1284,13 +1294,15 @@ has date => (
     default => sub {
         my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime;
         return sprintf('%04d-%02d-%02d', $year, $mon, $mday);
-    });
+    }
+);
 has time => (
     is => 'rw',
     default => sub {
         my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime;
         return sprintf('%02d:%02d:%02d', $hour, $min, $sec);
-    });
+    }
+);
 
 has perm => (is => 'rw');
 has path_info => (is => 'rw');
@@ -1329,7 +1341,8 @@ has file_info => (
 has java_info => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 has strings => (
     is => 'rw',
     coerce => sub { my ($text) = @_; return ($text // $EMPTY); },
@@ -1343,7 +1356,8 @@ has objdump => (
 has ar_info => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has index => (is => 'rw');
 has childnames => (is => 'rw', default => sub { {} });
@@ -1362,7 +1376,8 @@ has parent_dir => (
 
         # returns root by default
         return $self->index->lookup($self->dirname);
-    });
+    }
+);
 has dereferenced => (is => 'rw');
 
 =item bytes
diff --git a/lib/Lintian/Index/Md5sums.pm b/lib/Lintian/Index/Md5sums.pm
index 6f2505989f..5f01303f01 100644
--- a/lib/Lintian/Index/Md5sums.pm
+++ b/lib/Lintian/Index/Md5sums.pm
@@ -92,7 +92,8 @@ sub add_md5sums {
             my ($partial_sums, undef) = read_md5sums($stdout);
 
             $md5sums{$_} = $partial_sums->{$_}for @partial;
-        });
+        }
+    );
 
     $_->md5sum($md5sums{$_->name}) for @files;
 
diff --git a/lib/Lintian/Inspect/Changelog.pm b/lib/Lintian/Inspect/Changelog.pm
index 7ef3654c54..c1a0415792 100644
--- a/lib/Lintian/Inspect/Changelog.pm
+++ b/lib/Lintian/Inspect/Changelog.pm
@@ -131,10 +131,12 @@ m/^(?<Source>\w[-+0-9a-z.]*) \((?<Version>[^\(\) \t]+)\)(?<Distribution>(?:\s+[-
 
             unless ($expect eq 'first heading'
                 || $expect eq 'next heading or eof') {
-                $entry->ERROR([
-                    $lineno,"found start of entry where expected $expect",
-                    $literal
-                ]);
+                $entry->ERROR(
+                    [
+                        $lineno,"found start of entry where expected $expect",
+                        $literal
+                    ]
+                );
                 push @{$self->errors}, $entry->ERROR;
             }
 
@@ -274,10 +276,12 @@ m/^ \-\- (?<name>.*) <(?<email>.*)>(?<sep>  ?)(?<date>(?:\w+\,\s*)?\d{1,2}\s+\w+
                     $entry->Urgency_LC($UNKNOWN);
                     $entry->Version($UNKNOWN . ($unknowncounter++));
                     $entry->Urgency_Comment($EMPTY);
-                    $entry->ERROR([
-                        $lineno,
-                        "found change data where expected $expect",$_
-                    ]);
+                    $entry->ERROR(
+                        [
+                            $lineno,
+                            "found change data where expected $expect",$_
+                        ]
+                    );
                 }
               };
             $entry->{'Changes'} .= (" \n" x $blanklines)." $_\n";
diff --git a/lib/Lintian/Output/EWI.pm b/lib/Lintian/Output/EWI.pm
index 1089402686..4cbb637efd 100644
--- a/lib/Lintian/Output/EWI.pm
+++ b/lib/Lintian/Output/EWI.pm
@@ -136,7 +136,7 @@ sub issue_hints {
     }
 
     my @sorted = sort {
-             defined $a->override <=> defined $b->override
+        defined $a->override <=> defined $b->override
           || $CODE_PRIORITY{$a->tag->code} <=> $CODE_PRIORITY{$b->tag->code}
           || $a->tag->name cmp $b->tag->name
           || $TYPE_PRIORITY{$a->processable->type}
@@ -384,7 +384,7 @@ sub describe_tag {
         if (@{$tag->renamed_from}) {
 
             $wrapped .= wrap($DESCRIPTION_PREFIX, $DESCRIPTION_PREFIX,
-                    'Renamed from: '
+                'Renamed from: '
                   . join($SPACE, @{$tag->renamed_from})
                   . $NEWLINE);
         }
diff --git a/lib/Lintian/Output/HTML.pm b/lib/Lintian/Output/HTML.pm
index aa5b39f4f9..6f44fb7697 100644
--- a/lib/Lintian/Output/HTML.pm
+++ b/lib/Lintian/Output/HTML.pm
@@ -126,7 +126,8 @@ sub issue_hints {
         {
             title => 'Lintian Tags',
             output => \%output,
-        });
+        }
+    );
 
     print encode_utf8($page);
 
@@ -143,7 +144,7 @@ sub hintlist {
     my @hints;
 
     my @sorted = sort {
-               defined $a->override <=> defined $b->override
+        defined $a->override <=> defined $b->override
           ||   $CODE_PRIORITY{$a->tag->code}<=> $CODE_PRIORITY{$b->tag->code}
           || $a->tag->name cmp $b->tag->name
           || $a->context cmp $b->context
diff --git a/lib/Lintian/Output/JSON.pm b/lib/Lintian/Output/JSON.pm
index 890d162d80..9d0e3b543e 100644
--- a/lib/Lintian/Output/JSON.pm
+++ b/lib/Lintian/Output/JSON.pm
@@ -124,7 +124,7 @@ sub hintlist {
     my @hint_dictionaries;
 
     my @sorted = sort {
-               defined $a->override <=> defined $b->override
+        defined $a->override <=> defined $b->override
           ||   $CODE_PRIORITY{$a->tag->code}<=> $CODE_PRIORITY{$b->tag->code}
           || $a->tag->name cmp $b->tag->name
           || $a->context cmp $b->context
diff --git a/lib/Lintian/Pool.pm b/lib/Lintian/Pool.pm
index 9b3908b8a9..8ee26257a3 100644
--- a/lib/Lintian/Pool.pm
+++ b/lib/Lintian/Pool.pm
@@ -94,7 +94,8 @@ has basedir => (
         $absolute->mkpath({mode => $WORLD_WRITABLE_FOLDER});
 
         return $absolute;
-    });
+    }
+);
 
 =item $pool->basedir
 
@@ -187,7 +188,7 @@ sub process{
         my @override_experimental = grep { $_->tag->experimental } @override;
 
         $unused_overrides+= scalar grep {
-                 $_->tag->name eq 'mismatched-override'
+            $_->tag->name eq 'mismatched-override'
               || $_->tag->name eq 'unused-override'
         } @hints;
 
@@ -265,13 +266,15 @@ sub process{
                 say encode_utf8(
                     sprintf(
                         $FORMAT,'PID', 'TTY', 'STATUS', 'START', 'COMMAND'
-                    ));
+                    )
+                );
 
                 say encode_utf8(
                     sprintf($FORMAT,
                         $_->pid,$_->ttydev,
                         $_->state,scalar(localtime($_->start)),
-                        $_->cmndline))for @leftover;
+                        $_->cmndline)
+                )for @leftover;
 
                 ${$exit_code_ref} = 1;
                 die encode_utf8("Aborting.\n");
diff --git a/lib/Lintian/Processable.pm b/lib/Lintian/Processable.pm
index bd5aaaacc4..4866a27ed5 100644
--- a/lib/Lintian/Processable.pm
+++ b/lib/Lintian/Processable.pm
@@ -194,7 +194,8 @@ has basedir => (
         my $basedir = $self->pooldir . "/$path";
 
         return $basedir;
-    });
+    }
+);
 
 =item C<identifier>
 
diff --git a/lib/Lintian/Processable/Changelog.pm b/lib/Lintian/Processable/Changelog.pm
index 4a056767c3..8a65707879 100644
--- a/lib/Lintian/Processable/Changelog.pm
+++ b/lib/Lintian/Processable/Changelog.pm
@@ -134,7 +134,8 @@ has changelog_path => (
           unless defined $changelogpath;
 
         return $changelogpath;
-    });
+    }
+);
 
 =item changelog
 
@@ -171,7 +172,8 @@ has changelog => (
         $changelog->parse(decode_utf8($bytes));
 
         return $changelog;
-    });
+    }
+);
 
 1;
 
diff --git a/lib/Lintian/Processable/Changelog/Version.pm b/lib/Lintian/Processable/Changelog/Version.pm
index 332f7cb0fe..2791905cad 100644
--- a/lib/Lintian/Processable/Changelog/Version.pm
+++ b/lib/Lintian/Processable/Changelog/Version.pm
@@ -81,7 +81,8 @@ has changelog_version => (
         };
 
         return $version;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Control.pm b/lib/Lintian/Processable/Control.pm
index 328a11d142..50114e2013 100644
--- a/lib/Lintian/Processable/Control.pm
+++ b/lib/Lintian/Processable/Control.pm
@@ -72,7 +72,8 @@ has control => (
           for uniq split(/\n/, $errors);
 
         return $index;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Control/Conffiles.pm b/lib/Lintian/Processable/Control/Conffiles.pm
index 89c3429d5e..9d7b53e144 100644
--- a/lib/Lintian/Processable/Control/Conffiles.pm
+++ b/lib/Lintian/Processable/Control/Conffiles.pm
@@ -58,7 +58,8 @@ has conffiles => (
         $conffiles->parse($file, $self);
 
         return $conffiles;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Debian/Control.pm b/lib/Lintian/Processable/Debian/Control.pm
index 6bb267b530..1dc6babcae 100644
--- a/lib/Lintian/Processable/Debian/Control.pm
+++ b/lib/Lintian/Processable/Debian/Control.pm
@@ -65,7 +65,8 @@ has debian_control => (
         $control->load($file->unpacked_path);
 
         return $control;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Diffstat.pm b/lib/Lintian/Processable/Diffstat.pm
index b821fc2868..a86c87d29e 100644
--- a/lib/Lintian/Processable/Diffstat.pm
+++ b/lib/Lintian/Processable/Diffstat.pm
@@ -137,7 +137,8 @@ has diffstat => (
         }
 
         return \%diffstat;
-    });
+    }
+);
 
 1;
 
diff --git a/lib/Lintian/Processable/Fields/Files.pm b/lib/Lintian/Processable/Fields/Files.pm
index ee67f760d5..f9e04778c8 100644
--- a/lib/Lintian/Processable/Fields/Files.pm
+++ b/lib/Lintian/Processable/Fields/Files.pm
@@ -157,7 +157,8 @@ has files => (
         }
 
         return \%files;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Installable/Relation.pm b/lib/Lintian/Processable/Installable/Relation.pm
index 17edbc2f3b..31d5daf34b 100644
--- a/lib/Lintian/Processable/Installable/Relation.pm
+++ b/lib/Lintian/Processable/Installable/Relation.pm
@@ -93,12 +93,14 @@ object will be empty (always present and satisfies nothing).
 has saved_relations => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 my %alias = (
     all    => [qw(Pre-Depends Depends Recommends Suggests)],
     strong => [qw(Pre-Depends Depends)],
-    weak   => [qw(Recommends Suggests)]);
+    weak   => [qw(Recommends Suggests)]
+);
 
 my %known = map { $_ => 1 }
   qw(pre-depends depends recommends suggests enhances breaks
diff --git a/lib/Lintian/Processable/Installed.pm b/lib/Lintian/Processable/Installed.pm
index 264c40b189..5883849b72 100644
--- a/lib/Lintian/Processable/Installed.pm
+++ b/lib/Lintian/Processable/Installed.pm
@@ -76,7 +76,8 @@ has installed => (
           for uniq split(/\n/, $errors);
 
         return $index;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/IsNonFree.pm b/lib/Lintian/Processable/IsNonFree.pm
index 1292c5175f..de856e09e5 100644
--- a/lib/Lintian/Processable/IsNonFree.pm
+++ b/lib/Lintian/Processable/IsNonFree.pm
@@ -83,7 +83,8 @@ has is_non_free => (
           if $section =~ m{^(?:non-free|restricted|multiverse)/};
 
         return 0;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/NotJustDocs.pm b/lib/Lintian/Processable/NotJustDocs.pm
index 1687d98da1..9e08930115 100644
--- a/lib/Lintian/Processable/NotJustDocs.pm
+++ b/lib/Lintian/Processable/NotJustDocs.pm
@@ -88,7 +88,8 @@ has not_just_docs => (
         }
 
         return 1;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Objdump.pm b/lib/Lintian/Processable/Objdump.pm
index 661c3b1bd0..64a6c9a6fd 100644
--- a/lib/Lintian/Processable/Objdump.pm
+++ b/lib/Lintian/Processable/Objdump.pm
@@ -179,7 +179,8 @@ has objdump_info => (
           for keys %objdump_info;
 
         return \%objdump_info;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Orig.pm b/lib/Lintian/Processable/Orig.pm
index b8cddebbbc..1d6627c3b4 100644
--- a/lib/Lintian/Processable/Orig.pm
+++ b/lib/Lintian/Processable/Orig.pm
@@ -107,9 +107,10 @@ has orig => (
             die encode_utf8("Don't know how to decompress $tarball")
               unless $decompress;
 
-            my @command
-              = (split($SPACE, $decompress),
-                $self->basedir . $SLASH . $tarball);
+            my @command= (
+                split($SPACE, $decompress),
+                $self->basedir . $SLASH . $tarball
+            );
 
             my $errors = $subindex->create_from_piped_tar(\@command);
 
@@ -173,7 +174,8 @@ has orig => (
         }
 
         return $index;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Overrides.pm b/lib/Lintian/Processable/Overrides.pm
index e7dd44277a..be9f466216 100644
--- a/lib/Lintian/Processable/Overrides.pm
+++ b/lib/Lintian/Processable/Overrides.pm
@@ -291,8 +291,10 @@ has overrides => (
 
             if (exists $override_data{$tagname}{$context}) {
 
-                my @same_context
-                  = ($override_data{$tagname}{$context}{line}, $current{line});
+                my @same_context= (
+                    $override_data{$tagname}{$context}{line},
+                    $current{line}
+                );
 
                 $self->hint('duplicate-override-context', $tagname, 'lines',
                     sort @same_context);
@@ -309,7 +311,8 @@ has overrides => (
         }
 
         return \%override_data;
-    });
+    }
+);
 
 1;
 
diff --git a/lib/Lintian/Processable/Patched.pm b/lib/Lintian/Processable/Patched.pm
index bdbff66c99..4ba1fe4ecd 100644
--- a/lib/Lintian/Processable/Patched.pm
+++ b/lib/Lintian/Processable/Patched.pm
@@ -117,8 +117,9 @@ has patched => (
           or die encode_utf8('Cannot change to directory ' . $index->basedir);
 
         # fix permissions
-        my @permissions_command
-          = ('chmod', '-R', 'u+rwX,o+rX,o-w', $index->basedir);
+        my @permissions_command= (
+            'chmod', '-R', 'u+rwX,o+rX,o-w', $index->basedir
+        );
         my $permissions_errors;
 
         run3(\@permissions_command, \undef, \undef, \$permissions_errors);
@@ -134,7 +135,8 @@ has patched => (
           split(/\n/, $unpack_errors . $index_errors . $permissions_errors);
 
         return $index;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Source/Components.pm b/lib/Lintian/Processable/Source/Components.pm
index a1aafaecb0..adec138a73 100644
--- a/lib/Lintian/Processable/Source/Components.pm
+++ b/lib/Lintian/Processable/Source/Components.pm
@@ -102,7 +102,8 @@ has components => (
         }
 
         return \%components;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Source/Format.pm b/lib/Lintian/Processable/Source/Format.pm
index cf146f0570..cb79128af1 100644
--- a/lib/Lintian/Processable/Source/Format.pm
+++ b/lib/Lintian/Processable/Source/Format.pm
@@ -62,7 +62,8 @@ has source_format => (
         my $format = $self->fields->value('Format') || '1.0';
 
         return $format;
-    });
+    }
+);
 
 =item native
 
@@ -110,7 +111,8 @@ has native => (
           if exists $self->files->{$diffname};
 
         return 1;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Processable/Source/Relation.pm b/lib/Lintian/Processable/Source/Relation.pm
index 33b622f57d..141521e66e 100644
--- a/lib/Lintian/Processable/Source/Relation.pm
+++ b/lib/Lintian/Processable/Source/Relation.pm
@@ -97,12 +97,14 @@ relation as packages named after the substvar.
 has saved_binary_relations => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 my %alias = (
     all    => [qw(Pre-Depends Depends Recommends Suggests)],
     strong => [qw(Pre-Depends Depends)],
-    weak   => [qw(Recommends Suggests)]);
+    weak   => [qw(Recommends Suggests)]
+);
 
 my %known = map { $_ => 1 }
   qw(pre-depends depends recommends suggests enhances breaks
@@ -174,7 +176,8 @@ object will be empty (present but satisfies nothing).
 has saved_relations => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 sub relation {
     my ($self, $name) = @_;
@@ -221,7 +224,8 @@ restrictions and build profile restrictions in the FIELD field.
 has saved_relations_norestriction => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 sub relation_norestriction {
     my ($self, $name) = @_;
diff --git a/lib/Lintian/Processable/Source/Repacked.pm b/lib/Lintian/Processable/Source/Repacked.pm
index 68de57ab74..8b01d9bf96 100644
--- a/lib/Lintian/Processable/Source/Repacked.pm
+++ b/lib/Lintian/Processable/Source/Repacked.pm
@@ -74,7 +74,8 @@ has repacked => (
         my $upstream = $self->changelog_version->upstream;
 
         return $upstream =~ $PKGREPACK_REGEX;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Profile.pm b/lib/Lintian/Profile.pm
index bc96223c4a..8307f3dc52 100644
--- a/lib/Lintian/Profile.pm
+++ b/lib/Lintian/Profile.pm
@@ -112,22 +112,26 @@ to create this instance of the profile (e.g. due to symlinks).
 has known_aliases => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has check_module_by_name => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has check_path_by_name => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has tagnames_for_check => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has display_level_lookup => (
     is => 'rw',
@@ -140,27 +144,32 @@ has display_level_lookup => (
             warning        => 1,
             error          => 1,
         }
-    });
+    }
+);
 
 has enabled_checks_by_name => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has enabled_tags_by_name => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has files => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has known_tags_by_name => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has name => (
     is => 'rw',
@@ -171,24 +180,28 @@ has name => (
 has non_overridable_tags => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has parent_map => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 has profile_list => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 has our_vendor => (is => 'rw');
 
 has include_dirs => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 # Temporary until aptdaemon (etc.) has been upgraded to handle
 # Lintian loading code from user dirs.
@@ -196,7 +209,8 @@ has include_dirs => (
 has safe_include_dirs => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 =item data_paths
 
@@ -237,7 +251,8 @@ has known_vendors => (
         }
 
         return \@vendors;
-    });
+    }
+);
 
 has user_dirs => (
     is => 'ro',
@@ -261,7 +276,8 @@ has user_dirs => (
         const my @IMMUTABLE => grep { length && -e } @user_data;
 
         return \@IMMUTABLE;
-    });
+    }
+);
 
 =item load ([$profname[, $ipath[, $extra]]])
 
@@ -828,7 +844,8 @@ sub display {
 has data_cache => (
     is => 'rw',
     coerce => sub { my ($hashref) = @_; return ($hashref // {}); },
-    default => sub { {} });
+    default => sub { {} }
+);
 
 =item load_data
 
diff --git a/lib/Lintian/Profile/Architectures.pm b/lib/Lintian/Profile/Architectures.pm
index ad700a8cc3..2acb774dde 100644
--- a/lib/Lintian/Profile/Architectures.pm
+++ b/lib/Lintian/Profile/Architectures.pm
@@ -57,7 +57,8 @@ has architectures => (
         $architectures->load($self->data_paths, $self->our_vendor);
 
         return $architectures;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Profile/Debhelper/Levels.pm b/lib/Lintian/Profile/Debhelper/Levels.pm
index 08f9de4b41..b12de8ae8f 100644
--- a/lib/Lintian/Profile/Debhelper/Levels.pm
+++ b/lib/Lintian/Profile/Debhelper/Levels.pm
@@ -57,7 +57,8 @@ has debhelper_levels => (
         $levels->load($self->data_paths, $self->our_vendor);
 
         return $levels;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Profile/Hardening/Buildflags.pm b/lib/Lintian/Profile/Hardening/Buildflags.pm
index 91353c2260..45e4ecc1cf 100644
--- a/lib/Lintian/Profile/Hardening/Buildflags.pm
+++ b/lib/Lintian/Profile/Hardening/Buildflags.pm
@@ -56,7 +56,8 @@ has hardening_buildflags => (
         $buildflags->load($self->data_paths, $self->our_vendor);
 
         return $buildflags;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Profile/Manual/References.pm b/lib/Lintian/Profile/Manual/References.pm
index c1d9cd22eb..8acdd788e6 100644
--- a/lib/Lintian/Profile/Manual/References.pm
+++ b/lib/Lintian/Profile/Manual/References.pm
@@ -57,7 +57,8 @@ has manual_references => (
         $manuals->load($self->data_paths, $self->our_vendor);
 
         return $manuals;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Profile/Policy/Releases.pm b/lib/Lintian/Profile/Policy/Releases.pm
index be4d10c9d7..2c9095afce 100644
--- a/lib/Lintian/Profile/Policy/Releases.pm
+++ b/lib/Lintian/Profile/Policy/Releases.pm
@@ -56,7 +56,8 @@ has policy_releases => (
         $releases->load($self->data_paths, $self->our_vendor);
 
         return $releases;
-    });
+    }
+);
 
 =back
 
diff --git a/lib/Lintian/Relation/Predicate.pm b/lib/Lintian/Relation/Predicate.pm
index c1e46cd444..ff89343f42 100644
--- a/lib/Lintian/Relation/Predicate.pm
+++ b/lib/Lintian/Relation/Predicate.pm
@@ -96,39 +96,46 @@ relationship a superset of another relationship."
 has literal => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has parsable => (is => 'rw', default => $FALSE);
 
 has name => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has multiarch_acceptor => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has version_operator => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has reference_version => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has build_architecture => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 has build_profile => (
     is => 'rw',
     default => $EMPTY,
-    coerce => sub { my ($text) = @_; return ($text // $EMPTY); });
+    coerce => sub { my ($text) = @_; return ($text // $EMPTY); }
+);
 
 =item parse
 
diff --git a/lib/Lintian/Reporting/ResourceManager.pm b/lib/Lintian/Reporting/ResourceManager.pm
index 521b328b49..6dd9758bda 100644
--- a/lib/Lintian/Reporting/ResourceManager.pm
+++ b/lib/Lintian/Reporting/ResourceManager.pm
@@ -140,7 +140,8 @@ sub install_resource {
             croak encode_utf8(
                 join($SPACE,
                     qq(Resource "${resource_name}" must not contain "/"),
-                    'when source_file is given'));
+                    'when source_file is given')
+            );
         }
     } else {
         $basename = basename($resource_name);
@@ -178,7 +179,8 @@ sub install_resource {
         croak encode_utf8(
             join($SPACE,
                 "Unknown install method ${method}",
-                '- please use "move" or "copy"'));
+                '- please use "move" or "copy"')
+        );
     }
     $self->{'_resource_cache'}{$basename} = $target_file;
     $self->{'_resource_integrity'}{$basename} = "sha256-${b64digest}";
diff --git a/lib/Lintian/Reporting/Util.pm b/lib/Lintian/Reporting/Util.pm
index a4d233e450..e549d7e2c1 100644
--- a/lib/Lintian/Reporting/Util.pm
+++ b/lib/Lintian/Reporting/Util.pm
@@ -60,11 +60,13 @@ use YAML::XS ();
 
 use Lintian::Relation::Version qw(versions_equal versions_comparator);
 
-our @EXPORT_OK = (qw(
+our @EXPORT_OK = (
+    qw(
       load_state_cache
       save_state_cache
       find_backlog
-));
+    )
+);
 
 const my $WIDELY_READABLE => oct(644);
 
diff --git a/lib/Lintian/Tag.pm b/lib/Lintian/Tag.pm
index 46c73d5972..2320c00edd 100644
--- a/lib/Lintian/Tag.pm
+++ b/lib/Lintian/Tag.pm
@@ -138,17 +138,20 @@ has explanation => (
 has see_also => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 has renamed_from => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 has screens => (
     is => 'rw',
     coerce => sub { my ($arrayref) = @_; return ($arrayref // []); },
-    default => sub { [] });
+    default => sub { [] }
+);
 
 has profile => (is => 'rw');
 
diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm
index cf3e409fdb..9461a252b1 100644
--- a/lib/Lintian/Util.pm
+++ b/lib/Lintian/Util.pm
@@ -36,7 +36,8 @@ our @EXPORT_OK;
 
 BEGIN {
 
-    @EXPORT_OK = (qw(
+    @EXPORT_OK = (
+        qw(
           get_file_checksum
           get_file_digest
           human_bytes
@@ -54,7 +55,8 @@ BEGIN {
           $PKGNAME_REGEX
           $PKGREPACK_REGEX
           $PKGVERSION_REGEX
-    ));
+        )
+    );
 }
 
 use Carp qw(croak);
diff --git a/lib/Lintian/Version.pm b/lib/Lintian/Version.pm
index ed33fd05e4..43d3a675d0 100644
--- a/lib/Lintian/Version.pm
+++ b/lib/Lintian/Version.pm
@@ -26,9 +26,11 @@ use v5.20;
 use warnings;
 use utf8;
 
-our @EXPORT_OK = (qw(
+our @EXPORT_OK = (
+    qw(
       guess_version
-));
+    )
+);
 
 use Exporter qw(import);
 
diff --git a/lib/Test/Lintian/Hooks.pm b/lib/Test/Lintian/Hooks.pm
index d26108fbc4..7c105cca00 100644
--- a/lib/Test/Lintian/Hooks.pm
+++ b/lib/Test/Lintian/Hooks.pm
@@ -172,7 +172,8 @@ sub find_missing_prerequisites {
     my $build_depends = join(
         ', ',
         grep { length }(
-            $testcase->value('Build-Depends'),$testcase->value('Test-Depends'))
+            $testcase->value('Build-Depends'),$testcase->value('Test-Depends')
+        )
     );
 
     push(@lines, "Build-Depends: $build_depends")
@@ -182,7 +183,9 @@ sub find_missing_prerequisites {
         ', ',
         grep { length }(
             $testcase->value('Build-Conflicts'),
-            $testcase->value('Test-Conflicts')));
+            $testcase->value('Test-Conflicts')
+        )
+    );
     push(@lines, "Build-Conflicts: $build_conflicts")
       if length $build_conflicts;
 
diff --git a/lib/Test/Lintian/Prepare.pm b/lib/Test/Lintian/Prepare.pm
index 6d461685d2..d25d0e0ecf 100644
--- a/lib/Test/Lintian/Prepare.pm
+++ b/lib/Test/Lintian/Prepare.pm
@@ -452,7 +452,8 @@ sub combine_fields {
         $testcase->store(
             $destination,
             join($delimiter,
-                grep { length }($testcase->value($destination),$content)));
+                grep { length }($testcase->value($destination),$content))
+        );
     }
 
     # delete the combined entry if it is empty
diff --git a/lib/Test/Lintian/Run.pm b/lib/Test/Lintian/Run.pm
index 84af7e67c3..323026570e 100644
--- a/lib/Test/Lintian/Run.pm
+++ b/lib/Test/Lintian/Run.pm
@@ -237,8 +237,10 @@ sub runner {
         my $match = 0;
         for my $wildcard (@wildcards) {
 
-            my @command = (qw{dpkg-architecture -a},
-                $ENV{'DEB_HOST_ARCH'}, '-i', $wildcard);
+            my @command = (
+                qw{dpkg-architecture -a},
+                $ENV{'DEB_HOST_ARCH'}, '-i', $wildcard
+            );
             run3(\@command, \undef, \undef, \undef);
             my $status = ($? >> $WAIT_STATUS_SHIFT);
 
diff --git a/lib/Test/Lintian/Templates.pm b/lib/Test/Lintian/Templates.pm
index 2749ea0147..28dbf98a6f 100644
--- a/lib/Test/Lintian/Templates.pm
+++ b/lib/Test/Lintian/Templates.pm
@@ -107,8 +107,12 @@ sub copy_skeleton_template_sets {
             "Cannot find template set '$name' at $templatesetpath.")
           unless -d $templatesetpath;
 
-        say encode_utf8("Installing template set '$name'"
-              . ($relative ne $DOT ? " to ./$relative." : $EMPTY));
+        say encode_utf8(
+            "Installing template set '$name'"
+              . (
+                $relative ne $DOT ? " to ./$relative." : $EMPTY
+              )
+        );
 
         # create directory
         my $destination = "$runpath/$relative";
@@ -176,19 +180,27 @@ sub fill_skeleton_templates {
 
             say encode_utf8($EMPTY);
 
-            say encode_utf8('Generate files '
-                  . ($relative ne $DOT ? "in ./$relative " : $EMPTY)
-                  . "from templates using whitelist '$name'.");
+            say encode_utf8(
+                'Generate files '
+                  . (
+                    $relative ne $DOT ? "in ./$relative " : $EMPTY
+                  )
+                  . "from templates using whitelist '$name'."
+            );
             my $whitelist = read_config($whitelistpath);
 
             my @candidates = $whitelist->trimmed_list('May-Generate');
             my $destination = "$runpath/$relative";
 
-            say encode_utf8('Fill templates'
-                  . ($relative ne $DOT ? " in ./$relative" : $EMPTY)
+            say encode_utf8(
+                'Fill templates'
+                  . (
+                    $relative ne $DOT ? " in ./$relative" : $EMPTY
+                  )
                   . $COLON
                   . $SPACE
-                  . join($SPACE, @candidates));
+                  . join($SPACE, @candidates)
+            );
 
             foreach my $candidate (@candidates) {
                 my $generated = rel2abs($candidate, $destination);
diff --git a/private/generate-profiles b/private/generate-profiles
index 47cce0a7cb..e6543673f1 100755
--- a/private/generate-profiles
+++ b/private/generate-profiles
@@ -58,7 +58,8 @@ generate_profile(
     'debian', 'main',
     {
         'Enable-Tags-From-Check' => \@allchecks,
-    });
+    }
+);
 
 # generate profile for FTP Master auto-reject
 my $auto_reject_url = 'https://ftp-master.debian.org/static/lintian.tags';
@@ -175,7 +176,8 @@ generate_profile(
     {
         'Tags' => \@fatal,
         'Overridable' => ['no'],
-    });
+    }
+);
 
 exit 0;
 
diff --git a/private/refresh-mail-transport-agents b/private/refresh-mail-transport-agents
index 40a0938138..8dfa73bf1f 100755
--- a/private/refresh-mail-transport-agents
+++ b/private/refresh-mail-transport-agents
@@ -45,15 +45,17 @@ my $cache = AptPkg::Cache->new;
 warn encode_utf8(
     join(q{ },
         'Warning: this list should only be updated on a system',
-        'with an up to date APT cache of the Debian unstable distribution'))
+        'with an up to date APT cache of the Debian unstable distribution')
+  )
   if (
     none {
-             defined $_->{Origin}
+        defined $_->{Origin}
           && defined $_->{Archive}
           && $_->{Origin} eq 'Debian'
           && $_->{Archive} eq 'unstable';
     }
-    @{$cache->files});
+    @{$cache->files}
+  );
 
 my $versions = $cache->{'mail-transport-agent'}
   or
diff --git a/private/refresh-perl-provides b/private/refresh-perl-provides
index 04da4c7972..1407acca7c 100755
--- a/private/refresh-perl-provides
+++ b/private/refresh-perl-provides
@@ -75,15 +75,17 @@ my @core_packages = (qw(perl-base perl), "perl-modules-$perl_version");
 warn encode_utf8(
     join(q{ },
         'Warning: this list should only be updated on a system',
-        'with an up to date APT cache of the Debian unstable distribution'))
+        'with an up to date APT cache of the Debian unstable distribution')
+  )
   if (
     none {
-             defined $_->{Origin}
+        defined $_->{Origin}
           && defined $_->{Archive}
           && $_->{Origin} eq 'Debian'
           && $_->{Archive} eq 'unstable';
     }
-    @{$cache->files});
+    @{$cache->files}
+  );
 
 print encode_utf8(<<"EOF");
 # virtual packages provided by the Perl core packages that also have a
diff --git a/private/runtests b/private/runtests
index bdf09e635e..6e2b1fe500 100755
--- a/private/runtests
+++ b/private/runtests
@@ -129,8 +129,7 @@ if (($ENV{LINTIAN_TEST_INSTALLED} // 'no') eq 'yes') {
     $ENV{LINTIAN_UNDER_TEST} = realpath(THISDIR . '/../bin/lintian');
 }
 
-$ENV{LINTIAN_BASE}
-  = realpath(dirname(dirname($ENV{LINTIAN_UNDER_TEST})))
+$ENV{LINTIAN_BASE}= realpath(dirname(dirname($ENV{LINTIAN_UNDER_TEST})))
   // die encode_utf8('Cannot resolve LINTIAN_BASE');
 
 # options
@@ -199,8 +198,10 @@ $outpath = rel2abs($outpath);
 my $ACTIVE_JOBS = 0;
 
 # get lintian modification date
-my @lintianparts
-  = ('checks', 'commands', 'data','bin', 'profiles', 'vendors', 'lib/Lintian');
+my @lintianparts= (
+    'checks', 'commands', 'data','bin',
+    'profiles', 'vendors', 'lib/Lintian'
+);
 my @lintianfiles
   = map { File::Find::Rule->file->in("$ENV{'LINTIAN_BASE'}/$_") }@lintianparts;
 push(@lintianfiles, Cwd::realpath($ENV{'LINTIAN_UNDER_TEST'}));
@@ -283,8 +284,9 @@ say encode_utf8(
 );
 
 # get harness date, including templates, skeletons and whitelists
-my @harnessparts
-  = ('bin', 't/defaults', 't/templates', 't/skeletons', 't/whitelists');
+my @harnessparts= (
+    'bin', 't/defaults', 't/templates', 't/skeletons', 't/whitelists'
+);
 my @harnessfiles
   = map { File::Find::Rule->file->in("$ENV{'LINTIAN_BASE'}/$_") }@harnessparts;
 my $harness_files_epoch
@@ -304,21 +306,27 @@ say encode_utf8($EMPTY);
 
 my $status = 0;
 
-my $formatter = TAP::Formatter::File->new({
-    errors => 1,
-    jobs => $numjobs,
-});
-$formatter = TAP::Formatter::Console->new({
+my $formatter = TAP::Formatter::File->new(
+    {
+        errors => 1,
+        jobs => $numjobs,
+    }
+);
+$formatter = TAP::Formatter::Console->new(
+    {
         errors => 1,
         jobs => $numjobs,
         color => 1,
-    }) if is_interactive;
+    }
+) if is_interactive;
 
-my $harness = TAP::Harness->new({
-    formatter => $formatter,
-    jobs => $numjobs,
-    lib => ["$ENV{'LINTIAN_BASE'}/lib"],
-});
+my $harness = TAP::Harness->new(
+    {
+        formatter => $formatter,
+        jobs => $numjobs,
+        lib => ["$ENV{'LINTIAN_BASE'}/lib"],
+    }
+);
 
 my $aggregator = TAP::Parser::Aggregator->new;
 $aggregator->start;
@@ -600,7 +608,8 @@ if (is_interactive && !$unattended) {
             my $decision_bytes = prompt(
                 encode_utf8(
 '>>>  Fix test (y), accept all (a), do not fix (n), quit (q/default)?'
-                ));
+                )
+            );
             my $decision = decode_utf8($decision_bytes);
 
             last
diff --git a/private/update-coverage b/private/update-coverage
index fcc2b5584f..b97b83801f 100755
--- a/private/update-coverage
+++ b/private/update-coverage
@@ -68,7 +68,8 @@ for my $desc (
     glob(
         join(q{ },
             't/tests/*/desc', 't/changes/*.desc',
-            't/debs/*/desc', 't/source/*/desc'))
+            't/debs/*/desc', 't/source/*/desc')
+    )
 ) {
     my ($data) = read_dpkg_control($desc);
     my $testname = $data->{'Testname'};
diff --git a/t/scripts/harness/hintextract.t b/t/scripts/harness/hintextract.t
index 0474eb0018..f4a9239c34 100644
--- a/t/scripts/harness/hintextract.t
+++ b/t/scripts/harness/hintextract.t
@@ -85,7 +85,8 @@ sub hintextract {
         system(
             'hintextract', '-f',$format,
             $inpath->stringify,$outpath->stringify
-        ));
+        )
+      );
 
     return $outpath->slurp;
 }
diff --git a/t/scripts/harness/prepare.t b/t/scripts/harness/prepare.t
index e1196f845c..2c7eaab4b4 100644
--- a/t/scripts/harness/prepare.t
+++ b/t/scripts/harness/prepare.t
@@ -91,8 +91,9 @@ is(
 isnt($testcase->unfolded_value('Test-Architectures'),
     'any', 'Correct test architectures');
 for my $testarch (@testarches) {
-    my @command
-      = (qw{dpkg-architecture --list-known --match-wildcard}, $testarch);
+    my @command= (
+        qw{dpkg-architecture --list-known --match-wildcard}, $testarch
+    );
     my $output;
 
     run3(\@command, \undef, \$output);
diff --git a/t/scripts/harness/tag-coverage.t b/t/scripts/harness/tag-coverage.t
index 1bfdbbaf02..35ba6ea14c 100644
--- a/t/scripts/harness/tag-coverage.t
+++ b/t/scripts/harness/tag-coverage.t
@@ -46,7 +46,8 @@ use Test::Lintian::Output::Universal qw(tag_name);
 const my $SPACE => q{ };
 const my $NEWLINE => qq{\n};
 
-my @known_missing = (qw(
+my @known_missing = (
+    qw(
       changed-by-invalid-for-derivative
       crossing-screens
       debian-files-list-in-source
@@ -66,7 +67,7 @@ my @known_missing = (qw(
       unpack-message-for-deb-control
       unpack-message-for-orig
       uses-deprecated-adttmp
-      ),
+    ),
 
 # the following tags are not testable due to restrictions in reprotest
 # building the tests causes regressions due to an unknown problem, maybe in docker
@@ -77,7 +78,8 @@ my @known_missing = (qw(
       bad-owner-for-doc-file
       non-standard-game-executable-perm
       rules-silently-require-root
-));
+    )
+);
 
 my $profile = Lintian::Profile->new;
 $profile->load(undef, undef, 0);
diff --git a/t/scripts/spellintian.t b/t/scripts/spellintian.t
index 5dd33c9abc..78cd84a973 100755
--- a/t/scripts/spellintian.t
+++ b/t/scripts/spellintian.t
@@ -52,7 +52,7 @@ sub t {
 my $s = "A familar brown gnu allows\nto jump over the lazy dog.\n";
 
 t($s,
-        'familar -> familiar'
+    'familar -> familiar'
       . $NEWLINE
       . '"allows to" -> "allows one to"'
       . $NEWLINE);
