diff --git a/Library/Homebrew/cmd/--cellar.rb b/Library/Homebrew/cmd/--cellar.rb
index 096c31bbd6..e12fcc5655 100644
--- a/Library/Homebrew/cmd/--cellar.rb
+++ b/Library/Homebrew/cmd/--cellar.rb
@@ -25,7 +25,7 @@ module Homebrew
     if Homebrew.args.named.blank?
       puts HOMEBREW_CELLAR
     else
-      puts ARGV.resolved_formulae.map(&:rack)
+      puts Homebrew.args.resolved_formulae.map(&:rack)
     end
   end
 end
diff --git a/Library/Homebrew/cmd/--prefix.rb b/Library/Homebrew/cmd/--prefix.rb
index 6969a00b26..4d8655fb6a 100644
--- a/Library/Homebrew/cmd/--prefix.rb
+++ b/Library/Homebrew/cmd/--prefix.rb
@@ -25,7 +25,7 @@ module Homebrew
     if Homebrew.args.named.blank?
       puts HOMEBREW_PREFIX
     else
-      puts ARGV.resolved_formulae.map { |f|
+      puts Homebrew.args.resolved_formulae.map { |f|
         f.opt_prefix.exist? ? f.opt_prefix : f.installed_prefix
       }
     end
diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb
index 72e867d133..a62e420451 100644
--- a/Library/Homebrew/cmd/gist-logs.rb
+++ b/Library/Homebrew/cmd/gist-logs.rb
@@ -142,10 +142,10 @@ module Homebrew
   end
 
   def gist_logs
-    raise FormulaUnspecifiedError if ARGV.resolved_formulae.length != 1
+    raise FormulaUnspecifiedError if Homebrew.args.resolved_formulae.length != 1
 
     Install.perform_preinstall_checks(all_fatal: true)
     Install.perform_build_from_source_checks(all_fatal: true)
-    gistify_logs(ARGV.resolved_formulae.first)
+    gistify_logs(Homebrew.args.resolved_formulae.first)
   end
 end
diff --git a/Library/Homebrew/cmd/migrate.rb b/Library/Homebrew/cmd/migrate.rb
index cce46897c7..d5b6b7308d 100644
--- a/Library/Homebrew/cmd/migrate.rb
+++ b/Library/Homebrew/cmd/migrate.rb
@@ -27,7 +27,7 @@ module Homebrew
 
     raise FormulaUnspecifiedError if Homebrew.args.named.blank?
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       if f.oldname
         unless (rack = HOMEBREW_CELLAR/f.oldname).exist? && !rack.subdirs.empty?
           raise NoSuchKegError, f.oldname
diff --git a/Library/Homebrew/cmd/missing.rb b/Library/Homebrew/cmd/missing.rb
index 027b5110dc..4b51ed3439 100644
--- a/Library/Homebrew/cmd/missing.rb
+++ b/Library/Homebrew/cmd/missing.rb
@@ -33,7 +33,7 @@ module Homebrew
     ff = if Homebrew.args.named.blank?
       Formula.installed.sort
     else
-      ARGV.resolved_formulae.sort
+      Homebrew.args.resolved_formulae.sort
     end
 
     ff.each do |f|
diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb
index c6161d8707..c27713a236 100644
--- a/Library/Homebrew/cmd/outdated.rb
+++ b/Library/Homebrew/cmd/outdated.rb
@@ -35,10 +35,10 @@ module Homebrew
   def outdated
     outdated_args.parse
 
-    formulae = if ARGV.resolved_formulae.empty?
+    formulae = if Homebrew.args.resolved_formulae.blank?
       Formula.installed
     else
-      ARGV.resolved_formulae
+      Homebrew.args.resolved_formulae
     end
     if args.json
       raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
@@ -47,7 +47,7 @@ module Homebrew
     else
       outdated = print_outdated(formulae)
     end
-    Homebrew.failed = !ARGV.resolved_formulae.empty? && !outdated.empty?
+    Homebrew.failed = Homebrew.args.resolved_formulae.present? && !outdated.empty?
   end
 
   def print_outdated(formulae)
diff --git a/Library/Homebrew/cmd/pin.rb b/Library/Homebrew/cmd/pin.rb
index 33ae70e439..76cc6130c2 100644
--- a/Library/Homebrew/cmd/pin.rb
+++ b/Library/Homebrew/cmd/pin.rb
@@ -23,7 +23,7 @@ module Homebrew
 
     raise FormulaUnspecifiedError if args.remaining.empty?
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       if f.pinned?
         opoo "#{f.name} already pinned"
       elsif !f.pinnable?
diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb
index fd20bec0fb..dcecd0f937 100644
--- a/Library/Homebrew/cmd/postinstall.rb
+++ b/Library/Homebrew/cmd/postinstall.rb
@@ -25,7 +25,7 @@ module Homebrew
 
     raise KegUnspecifiedError if args.remaining.empty?
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       ohai "Postinstalling #{f}"
       fi = FormulaInstaller.new(f)
       fi.post_install
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 67acf71b4d..6b0f6ea588 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -53,7 +53,7 @@ module Homebrew
 
     Install.perform_preinstall_checks
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       if f.pinned?
         onoe "#{f.full_name} is pinned. You must unpin it to reinstall."
         next
diff --git a/Library/Homebrew/cmd/unpin.rb b/Library/Homebrew/cmd/unpin.rb
index 2ffd949893..6bd17b27f2 100644
--- a/Library/Homebrew/cmd/unpin.rb
+++ b/Library/Homebrew/cmd/unpin.rb
@@ -24,7 +24,7 @@ module Homebrew
 
     raise FormulaUnspecifiedError if args.remaining.empty?
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       if f.pinned?
         f.unpin
       elsif !f.pinnable?
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 29ffe5bd7f..9ef1e5f877 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -68,11 +68,11 @@ module Homebrew
 
       exit 0 if outdated.empty?
     else
-      outdated = ARGV.resolved_formulae.select do |f|
+      outdated = Homebrew.args.resolved_formulae.select do |f|
         f.outdated?(fetch_head: args.fetch_HEAD?)
       end
 
-      (ARGV.resolved_formulae - outdated).each do |f|
+      (Homebrew.args.resolved_formulae - outdated).each do |f|
         versions = f.installed_kegs.map(&:version)
         if versions.empty?
           ofail "#{f.full_specified_name} not installed"
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 13a706a333..0da9155ed5 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -83,8 +83,8 @@ module Homebrew
       ff = Formula
       files = Tap.map(&:formula_dir)
     else
-      ff = ARGV.resolved_formulae
-      files = ARGV.resolved_formulae.map(&:path)
+      ff = Homebrew.args.resolved_formulae
+      files = Homebrew.args.resolved_formulae.map(&:path)
     end
 
     only_cops = args.only_cops
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index b870e8d9ae..3495d428ef 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -89,7 +89,7 @@ module Homebrew
     raise KegUnspecifiedError if args.remaining.empty?
 
     ensure_relocation_formulae_installed! unless args.skip_relocation?
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       bottle_formula f
     end
   end
diff --git a/Library/Homebrew/dev-cmd/formula.rb b/Library/Homebrew/dev-cmd/formula.rb
index 1bb5fba2f9..b018489e6d 100644
--- a/Library/Homebrew/dev-cmd/formula.rb
+++ b/Library/Homebrew/dev-cmd/formula.rb
@@ -23,6 +23,6 @@ module Homebrew
 
     raise FormulaUnspecifiedError if Homebrew.args.named.blank?
 
-    ARGV.resolved_formulae.each { |f| puts f.path }
+    Homebrew.args.resolved_formulae.each { |f| puts f.path }
   end
 end
diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb
index 47ae4412b3..72b912789c 100644
--- a/Library/Homebrew/dev-cmd/test.rb
+++ b/Library/Homebrew/dev-cmd/test.rb
@@ -38,7 +38,7 @@ module Homebrew
 
     require "formula_assertions"
 
-    ARGV.resolved_formulae.each do |f|
+    Homebrew.args.resolved_formulae.each do |f|
       # Cannot test uninstalled formulae
       unless f.latest_version_installed?
         ofail "Testing requires the latest version of #{f.full_name}"
diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb
index 838556e17f..927e84097d 100644
--- a/Library/Homebrew/test.rb
+++ b/Library/Homebrew/test.rb
@@ -21,7 +21,7 @@ begin
 
   trap("INT", old_trap)
 
-  formula = ARGV.resolved_formulae.first
+  formula = Homebrew.args.resolved_formulae.first
   formula.extend(Homebrew::Assertions)
   formula.extend(Debrew::Formula) if ARGV.debug?