diff --git a/Sources/mas/Controllers/MasStoreSearch.swift b/Sources/mas/Controllers/MasStoreSearch.swift
index 9680070..a2cf5b2 100644
--- a/Sources/mas/Controllers/MasStoreSearch.swift
+++ b/Sources/mas/Controllers/MasStoreSearch.swift
@@ -126,7 +126,7 @@ class MasStoreSearch: StoreSearch {
         }
         .map { data in
             guard let html = String(data: data, encoding: .utf8),
-                let capture = MasStoreSearch.appVersionExpression.firstMatch(in: html)?.captures[0],
+                let capture = Self.appVersionExpression.firstMatch(in: html)?.captures[0],
                 let version = Version(tolerant: capture)
             else {
                 return nil
diff --git a/Sources/mas/ExternalCommands/SysCtlSystemCommand.swift b/Sources/mas/ExternalCommands/SysCtlSystemCommand.swift
index cbb24d9..abd5fb8 100644
--- a/Sources/mas/ExternalCommands/SysCtlSystemCommand.swift
+++ b/Sources/mas/ExternalCommands/SysCtlSystemCommand.swift
@@ -24,7 +24,7 @@ struct SysCtlSystemCommand: ExternalCommand {
     }
 
     static var isAppleSilicon: Bool = {
-        let sysctl = SysCtlSystemCommand()
+        let sysctl = Self()
         do {
             // Returns 1 on Apple Silicon even when run in an Intel context in Rosetta.
             try sysctl.run(arguments: "-in", "hw.optional.arm64")
diff --git a/Sources/mas/Mas.swift b/Sources/mas/Mas.swift
index 1d273fa..5fb8dda 100644
--- a/Sources/mas/Mas.swift
+++ b/Sources/mas/Mas.swift
@@ -36,7 +36,7 @@ struct Mas: ParsableCommand {
     )
 
     func validate() throws {
-        Mas.initialize()
+        Self.initialize()
     }
 
     static func initialize() {