diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 6f703d4b35..5f45013924 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -11,7 +11,6 @@ module Homebrew extend self
   def bottle_formula f
     unless f.installed?
       return ofail "Formula not installed: #{f.name}"
-      return
     end
 
     unless built_as_bottle? f
diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/cmd/edit.rb
index 34440024c3..f5635fa816 100644
--- a/Library/Homebrew/cmd/edit.rb
+++ b/Library/Homebrew/cmd/edit.rb
@@ -38,7 +38,7 @@ module Homebrew extend self
           raise FormulaUnavailableError, path.basename('.rb').to_s unless path.file?
         end
       end
-      exec_editor *paths
+      exec_editor(*paths)
     end
   end
 
diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb
index 75263f1724..08e5e0a7fd 100644
--- a/Library/Homebrew/cmd/home.rb
+++ b/Library/Homebrew/cmd/home.rb
@@ -3,7 +3,7 @@ module Homebrew extend self
     if ARGV.named.empty?
       exec_browser HOMEBREW_WWW
     else
-      exec_browser *ARGV.formulae.map{ |f| f.homepage }
+      exec_browser(*ARGV.formulae.map(&:homepage))
     end
   end
 end
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index 5423478c02..1f4b24652a 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -67,7 +67,7 @@ module Homebrew extend self
       end
     end
 
-    puts_capture.instance_eval &block
+    puts_capture.instance_eval(&block)
 
   ensure
     puts unless $did_puts
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index e925edbaac..cf4f098ee0 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -12,7 +12,7 @@ module Homebrew extend self
           keg.unlink
           keg.uninstall
           rm_opt_link keg.fname
-          unpin keg.fname
+          rm_pin keg.fname
         end
       end
     else
@@ -49,7 +49,7 @@ module Homebrew extend self
     optlink.unlink if optlink.symlink?
   end
 
-  def unpin name
+  def rm_pin name
     Formula.factory(name).unpin rescue nil
   end
 end
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 0fd5973912..8c2d522b8e 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -246,6 +246,7 @@ class << ENV
   # This should be a safe hack to prevent that exception cropping up.
   # Main consqeuence of this is that ENV['CFLAGS'] is never nil even when it
   # is which can break if checks, but we don't do such a check in our code.
+  alias_method :"old_[]", :[]
   def [] key
     if has_key? key
       fetch(key)