diff --git a/Library/Contributions/cmd/brew-which.rb b/Library/Contributions/cmd/brew-which.rb
index fede4f888c..870ff67a52 100755
--- a/Library/Contributions/cmd/brew-which.rb
+++ b/Library/Contributions/cmd/brew-which.rb
@@ -1,7 +1,6 @@
 require 'extend/pathname'
 
-
-module Homebrew extend self
+module Homebrew
   def which_versions which_brews=nil
     brew_links = Array.new
     version_map = Hash.new
diff --git a/Library/Homebrew/cmd/--cache.rb b/Library/Homebrew/cmd/--cache.rb
index c443357039..d966f7422f 100644
--- a/Library/Homebrew/cmd/--cache.rb
+++ b/Library/Homebrew/cmd/--cache.rb
@@ -1,6 +1,6 @@
 require "cmd/fetch"
 
-module Homebrew extend self
+module Homebrew
   def __cache
     if ARGV.named.empty?
       puts HOMEBREW_CACHE
diff --git a/Library/Homebrew/cmd/--cellar.rb b/Library/Homebrew/cmd/--cellar.rb
index 138a8d00c7..fafac847d6 100644
--- a/Library/Homebrew/cmd/--cellar.rb
+++ b/Library/Homebrew/cmd/--cellar.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __cellar
     if ARGV.named.empty?
       puts HOMEBREW_CELLAR
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
index 62675fd22b..668ed02f8c 100644
--- a/Library/Homebrew/cmd/--env.rb
+++ b/Library/Homebrew/cmd/--env.rb
@@ -1,7 +1,7 @@
 require 'extend/ENV'
 require 'hardware'
 
-module Homebrew extend self
+module Homebrew
   def __env
     ENV.activate_extensions!
 
diff --git a/Library/Homebrew/cmd/--prefix.rb b/Library/Homebrew/cmd/--prefix.rb
index 139578a534..3f4faebaa9 100644
--- a/Library/Homebrew/cmd/--prefix.rb
+++ b/Library/Homebrew/cmd/--prefix.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __prefix
     if ARGV.named.empty?
       puts HOMEBREW_PREFIX
diff --git a/Library/Homebrew/cmd/--repository.rb b/Library/Homebrew/cmd/--repository.rb
index f14ab9901c..e2a5feb131 100644
--- a/Library/Homebrew/cmd/--repository.rb
+++ b/Library/Homebrew/cmd/--repository.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __repository
     puts HOMEBREW_REPOSITORY
   end
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 1b46161cac..67d9faec12 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -3,7 +3,7 @@ require 'utils'
 require 'extend/ENV'
 require 'formula_cellar_checks'
 
-module Homebrew extend self
+module Homebrew
   def audit
     formula_count = 0
     problem_count = 0
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index eadf6a3dff..993f734660 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -32,7 +32,7 @@ BOTTLE_ERB = <<-EOS
   end
 EOS
 
-module Homebrew extend self
+module Homebrew
   def keg_contains string, keg
     if not ARGV.homebrew_developer?
       return quiet_system 'fgrep', '--recursive', '--quiet', '--max-count=1', string, keg
diff --git a/Library/Homebrew/cmd/cat.rb b/Library/Homebrew/cmd/cat.rb
index ddd66922a6..f42fbc0377 100644
--- a/Library/Homebrew/cmd/cat.rb
+++ b/Library/Homebrew/cmd/cat.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def cat
     # do not "fix" this to support multiple arguments, the output would be
     # unparsable, if the user wants to cat multiple formula they can call
diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
index aedec23032..3db9cca78f 100644
--- a/Library/Homebrew/cmd/cleanup.rb
+++ b/Library/Homebrew/cmd/cleanup.rb
@@ -2,8 +2,7 @@ require 'formula'
 require 'keg'
 require 'bottles'
 
-module Homebrew extend self
-
+module Homebrew
   def cleanup
     # individual cleanup_ methods should also check for the existence of the
     # appropriate directories before assuming they exist
diff --git a/Library/Homebrew/cmd/commands.rb b/Library/Homebrew/cmd/commands.rb
index 1d765f57b7..1ee13b049c 100644
--- a/Library/Homebrew/cmd/commands.rb
+++ b/Library/Homebrew/cmd/commands.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def commands
     # Find commands in Homebrew/cmd
     cmds = (HOMEBREW_REPOSITORY/"Library/Homebrew/cmd").
diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb
index f93578dcd8..9ee9cace24 100644
--- a/Library/Homebrew/cmd/config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -1,6 +1,6 @@
 require 'hardware'
 
-module Homebrew extend self
+module Homebrew
   def config
     dump_verbose_config
   end
diff --git a/Library/Homebrew/cmd/create.rb b/Library/Homebrew/cmd/create.rb
index 84697b830e..3997cfb4a4 100644
--- a/Library/Homebrew/cmd/create.rb
+++ b/Library/Homebrew/cmd/create.rb
@@ -3,7 +3,7 @@ require 'blacklist'
 require 'digest'
 require 'erb'
 
-module Homebrew extend self
+module Homebrew
 
   # Create a formula from a tarball URL
   def create
diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb
index 3abe1cf6ea..ac3a474262 100644
--- a/Library/Homebrew/cmd/deps.rb
+++ b/Library/Homebrew/cmd/deps.rb
@@ -1,7 +1,7 @@
 require 'formula'
 require 'ostruct'
 
-module Homebrew extend self
+module Homebrew
   def deps
     mode = OpenStruct.new(
       :installed?  => ARGV.include?('--installed'),
diff --git a/Library/Homebrew/cmd/diy.rb b/Library/Homebrew/cmd/diy.rb
index fa2304dda6..98d57c8192 100644
--- a/Library/Homebrew/cmd/diy.rb
+++ b/Library/Homebrew/cmd/diy.rb
@@ -1,6 +1,6 @@
 require "formula"
 
-module Homebrew extend self
+module Homebrew
   def diy
     %w[name version].each do |opt|
       if ARGV.include? "--set-#{opt}"
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index a6043a6516..281608e016 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -1122,7 +1122,7 @@ end
   end
 end # end class Checks
 
-module Homebrew extend self
+module Homebrew
   def doctor
     checks = Checks.new
 
diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/cmd/edit.rb
index 5f5fdf2fc7..08c730d792 100644
--- a/Library/Homebrew/cmd/edit.rb
+++ b/Library/Homebrew/cmd/edit.rb
@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def edit
     unless (HOMEBREW_REPOSITORY/'.git').directory?
       raise <<-EOS.undent
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb
index 9f485e6676..6dbe1b3eb2 100644
--- a/Library/Homebrew/cmd/fetch.rb
+++ b/Library/Homebrew/cmd/fetch.rb
@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def fetch
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb
index d185c41e2c..cc1afd061f 100644
--- a/Library/Homebrew/cmd/help.rb
+++ b/Library/Homebrew/cmd/help.rb
@@ -31,7 +31,7 @@ EOS
 # NOTE Keep lines less than 80 characters! Wrapping is just not cricket.
 # NOTE The reason the string is at the top is so 25 lines is easy to measure!
 
-module Homebrew extend self
+module Homebrew
   def help
     puts HOMEBREW_HELP
   end
diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb
index 08e5e0a7fd..43a6299ae0 100644
--- a/Library/Homebrew/cmd/home.rb
+++ b/Library/Homebrew/cmd/home.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def home
     if ARGV.named.empty?
       exec_browser HOMEBREW_WWW
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 7063fd60c1..9c2aad5a0e 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -5,7 +5,7 @@ require 'caveats'
 require 'blacklist'
 require 'utils/json'
 
-module Homebrew extend self
+module Homebrew
   def info
     # eventually we'll solidify an API, but we'll keep old versions
     # awhile around for compatibility
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index ca228e3387..f0fd9f7666 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -5,7 +5,7 @@ require "cmd/tap"
 require "formula_installer"
 require "hardware"
 
-module Homebrew extend self
+module Homebrew
   def install
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/irb.rb b/Library/Homebrew/cmd/irb.rb
index aa501e7f3e..5c0327877b 100644
--- a/Library/Homebrew/cmd/irb.rb
+++ b/Library/Homebrew/cmd/irb.rb
@@ -13,7 +13,7 @@ class String
   end
 end
 
-module Homebrew extend self
+module Homebrew
   def irb
     if ARGV.include? "--help"
       puts "'v8'.f # => instance of the Ack formula"
diff --git a/Library/Homebrew/cmd/leaves.rb b/Library/Homebrew/cmd/leaves.rb
index ea348f82f5..59cb19d74e 100644
--- a/Library/Homebrew/cmd/leaves.rb
+++ b/Library/Homebrew/cmd/leaves.rb
@@ -2,7 +2,7 @@ require 'formula'
 require 'tab'
 require 'set'
 
-module Homebrew extend self
+module Homebrew
   def leaves
     installed = Formula.installed
     deps_of_installed = Set.new
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index ff39ce8690..21c2379cf6 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -1,7 +1,6 @@
 require 'ostruct'
 
-module Homebrew extend self
-
+module Homebrew
   def link
     raise KegUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index 5cf2546251..50df5daa26 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -1,8 +1,7 @@
 # Links any Applications (.app) found in installed prefixes to /Applications
 require 'keg'
 
-module Homebrew extend self
-
+module Homebrew
   def linkapps
     target_dir = ARGV.include?("--local") ? File.expand_path("~/Applications") : "/Applications"
 
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 3f7e07d963..dfac6222d8 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -1,6 +1,6 @@
 require "metafiles"
 
-module Homebrew extend self
+module Homebrew
   def list
 
     # Use of exec means we don't explicitly exit
diff --git a/Library/Homebrew/cmd/log.rb b/Library/Homebrew/cmd/log.rb
index bc245850ad..c45f4735c1 100644
--- a/Library/Homebrew/cmd/log.rb
+++ b/Library/Homebrew/cmd/log.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def log
     if ARGV.named.empty?
       cd HOMEBREW_REPOSITORY
diff --git a/Library/Homebrew/cmd/missing.rb b/Library/Homebrew/cmd/missing.rb
index ea0df4a1df..6863699127 100644
--- a/Library/Homebrew/cmd/missing.rb
+++ b/Library/Homebrew/cmd/missing.rb
@@ -1,7 +1,7 @@
 require 'formula'
 require 'tab'
 
-module Homebrew extend self
+module Homebrew
   def missing_deps ff
     missing = {}
     ff.each do |f|
diff --git a/Library/Homebrew/cmd/options.rb b/Library/Homebrew/cmd/options.rb
index 97f376e444..06d0b080b8 100644
--- a/Library/Homebrew/cmd/options.rb
+++ b/Library/Homebrew/cmd/options.rb
@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def options
     if ARGV.include? '--all'
       puts_options Formula.to_a
diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb
index a8fb33cd08..d13e7d0c6b 100644
--- a/Library/Homebrew/cmd/outdated.rb
+++ b/Library/Homebrew/cmd/outdated.rb
@@ -1,7 +1,7 @@
 require 'formula'
 require 'keg'
 
-module Homebrew extend self
+module Homebrew
   def outdated
     outdated_brews do |f, versions|
       if ($stdout.tty? || ARGV.verbose?) and not ARGV.flag? '--quiet'
diff --git a/Library/Homebrew/cmd/pin.rb b/Library/Homebrew/cmd/pin.rb
index b8c1d1e330..f92ba9e567 100644
--- a/Library/Homebrew/cmd/pin.rb
+++ b/Library/Homebrew/cmd/pin.rb
@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def pin
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb
index db3125dc9d..d604167693 100644
--- a/Library/Homebrew/cmd/postinstall.rb
+++ b/Library/Homebrew/cmd/postinstall.rb
@@ -1,6 +1,6 @@
 require 'formula_installer'
 
-module Homebrew extend self
+module Homebrew
   def postinstall
     ARGV.formulae.each {|f| f.post_install }
   end
diff --git a/Library/Homebrew/cmd/prune.rb b/Library/Homebrew/cmd/prune.rb
index 0ea11ca733..3a8c23b325 100644
--- a/Library/Homebrew/cmd/prune.rb
+++ b/Library/Homebrew/cmd/prune.rb
@@ -1,7 +1,7 @@
 require 'keg'
 require 'cmd/tap'
 
-module Homebrew extend self
+module Homebrew
   def prune
     ObserverPathnameExtension.reset_counts!
 
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 24bffc5c51..113607236d 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -1,6 +1,6 @@
 require 'cmd/install'
 
-module Homebrew extend self
+module Homebrew
   def reinstall
     ARGV.formulae.each { |f| reinstall_formula(f) }
   end
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 180deeaddc..d8a68fcecd 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -3,7 +3,7 @@ require 'blacklist'
 require 'utils'
 require 'thread'
 
-module Homebrew extend self
+module Homebrew
 
   SEARCH_ERROR_QUEUE = Queue.new
 
diff --git a/Library/Homebrew/cmd/sh.rb b/Library/Homebrew/cmd/sh.rb
index 00b97ece14..65c5c2b0d9 100644
--- a/Library/Homebrew/cmd/sh.rb
+++ b/Library/Homebrew/cmd/sh.rb
@@ -1,7 +1,7 @@
 require 'extend/ENV'
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def sh
     ENV.activate_extensions!
 
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index b090f25b7b..e3795ce6f2 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -1,5 +1,4 @@
-module Homebrew extend self
-
+module Homebrew
   def tap
     if ARGV.empty?
       each_tap do |user, repo|
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index 187e2afe74..1b0569723e 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -3,7 +3,7 @@ require 'hardware'
 require 'keg'
 require 'timeout'
 
-module Homebrew extend self
+module Homebrew
   TEST_TIMEOUT_SECONDS = 5*60
 
   if defined?(Gem)
diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/cmd/tests.rb
index 27f522d652..5e74457695 100644
--- a/Library/Homebrew/cmd/tests.rb
+++ b/Library/Homebrew/cmd/tests.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def tests
     (HOMEBREW_LIBRARY/'Homebrew/test').cd do
       ENV['TESTOPTS'] = '-v' if ARGV.verbose?
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index 9400a3898f..f26f38fde4 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -1,7 +1,7 @@
 require 'keg'
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def uninstall
     raise KegUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/unlink.rb b/Library/Homebrew/cmd/unlink.rb
index a8e98d8d57..4833283ffd 100644
--- a/Library/Homebrew/cmd/unlink.rb
+++ b/Library/Homebrew/cmd/unlink.rb
@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def unlink
     raise KegUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/unlinkapps.rb b/Library/Homebrew/cmd/unlinkapps.rb
index 2f6a57e6ee..864e33b277 100644
--- a/Library/Homebrew/cmd/unlinkapps.rb
+++ b/Library/Homebrew/cmd/unlinkapps.rb
@@ -1,8 +1,7 @@
 # Unlinks any Applications (.app) found in installed prefixes from /Applications
 require 'keg'
 
-module Homebrew extend self
-
+module Homebrew
   def unlinkapps
     target_dir = ARGV.include?("--local") ? File.expand_path("~/Applications") : "/Applications"
 
diff --git a/Library/Homebrew/cmd/unpack.rb b/Library/Homebrew/cmd/unpack.rb
index ec9b0a1268..162d887b91 100644
--- a/Library/Homebrew/cmd/unpack.rb
+++ b/Library/Homebrew/cmd/unpack.rb
@@ -2,8 +2,6 @@ require "stringio"
 require "formula"
 
 module Homebrew
-  extend self
-
   module DATALoader
     # Original code from http://stackoverflow.com/a/2157556/371237
     def self.load(path)
diff --git a/Library/Homebrew/cmd/unpin.rb b/Library/Homebrew/cmd/unpin.rb
index 4da280eefe..9e8db4d7d2 100644
--- a/Library/Homebrew/cmd/unpin.rb
+++ b/Library/Homebrew/cmd/unpin.rb
@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def unpin
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index b71d44841a..7da36478bb 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -1,6 +1,6 @@
 require 'cmd/tap' # for tap_args
 
-module Homebrew extend self
+module Homebrew
   def untap
     raise "Usage is `brew untap <tap-name>`" if ARGV.empty?
 
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index 66d99d5df3..4322241d6b 100644
--- a/Library/Homebrew/cmd/update.rb
+++ b/Library/Homebrew/cmd/update.rb
@@ -1,7 +1,7 @@
 require 'cmd/tap'
 require 'cmd/untap'
 
-module Homebrew extend self
+module Homebrew
   def update
     unless ARGV.named.empty?
       abort <<-EOS.undent
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 1f9330beb1..4d78e9fa16 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -1,7 +1,7 @@
 require 'cmd/install'
 require 'cmd/outdated'
 
-module Homebrew extend self
+module Homebrew
   def upgrade
     Homebrew.perform_preinstall_checks
 
diff --git a/Library/Homebrew/cmd/uses.rb b/Library/Homebrew/cmd/uses.rb
index a6677b363a..719a107504 100644
--- a/Library/Homebrew/cmd/uses.rb
+++ b/Library/Homebrew/cmd/uses.rb
@@ -4,7 +4,7 @@ require 'formula'
 # If you want the union, run the command twice and concatenate the results.
 # The intersection is harder to achieve with shell tools.
 
-module Homebrew extend self
+module Homebrew
   def uses
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/cmd/versions.rb b/Library/Homebrew/cmd/versions.rb
index 302c7c3bce..349123d090 100644
--- a/Library/Homebrew/cmd/versions.rb
+++ b/Library/Homebrew/cmd/versions.rb
@@ -1,7 +1,7 @@
 require "formula"
 require "formula_versions"
 
-module Homebrew extend self
+module Homebrew
   def versions
     raise "Please `brew install git` first" unless which "git"
     raise "Please `brew update` first" unless (HOMEBREW_REPOSITORY/".git").directory?
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index e8e865976f..1c4056499e 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -93,8 +93,9 @@ HOMEBREW_CURL_ARGS = '-f#LA'
 
 require 'tap_constants'
 
-module Homebrew extend self
+module Homebrew
   include FileUtils
+  extend self
 
   attr_accessor :failed
   alias_method :failed?, :failed
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 7bc6630b0e..b675ee38e3 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -65,6 +65,7 @@ end
 
 module Homebrew
   include FileUtils
+  extend self
 
   module VersionAssertions
     def version v