diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb
index aff8e0be99..b6e01b290c 100644
--- a/Library/Homebrew/compat/compatibility.rb
+++ b/Library/Homebrew/compat/compatibility.rb
@@ -165,6 +165,7 @@ class FailsWithLLVM
   end
 end
 
+# TODO eventually some of these should print deprecation warnings
 module MacOS extend self
   def xcode_folder
     Xcode.folder
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index a58f980b04..e186760b35 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -1,5 +1,7 @@
 module MacOS extend self
 
+  # This can be compared to numerics, strings, or symbols
+  # using the standard Ruby Comparable methods.
   def version
     require 'version'
     MacOSVersion.new(MACOS_VERSION.to_s)
@@ -221,7 +223,7 @@ module MacOS extend self
 
   def bottles_supported?
     # We support bottles on all versions of OS X except 32-bit Snow Leopard.
-    (Hardware.is_64_bit? or not MacOS.snow_leopard?) \
+    (Hardware.is_64_bit? or not MacOS.version >= :snow_leopard) \
       and HOMEBREW_PREFIX.to_s == '/usr/local' \
       and HOMEBREW_CELLAR.to_s == '/usr/local/Cellar' \
   end
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 96606d1081..bdc271c3ef 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -119,7 +119,7 @@ class << ENV
     # we put our paths before X because we dupe some of the X libraries
     paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11?
     # Mountain Lion no longer ships some .pcs; ensure we pick up our versions
-    paths << "#{HOMEBREW_REPOSITORY}/Library/Homebrew/pkgconfig" if MacOS.mountain_lion?
+    paths << "#{HOMEBREW_REPOSITORY}/Library/Homebrew/pkgconfig" if MacOS.version >= :mountain_lion
     paths.to_path_s
   end
 
@@ -173,9 +173,9 @@ class << ENV
     s = ""
     s << 'b' if ARGV.build_bottle?
     # Fix issue with sed barfing on unicode characters on Mountain Lion
-    s << 's' if MacOS.mountain_lion?
+    s << 's' if MacOS.version >= :mountain_lion
     # Fix issue with 10.8 apr-1-config having broken paths
-    s << 'a' if MacOS.cat == :mountainlion
+    s << 'a' if MacOS.version == :mountain_lion
     s
   end