diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 475ecf688d..93e8b78573 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -41,8 +41,8 @@ class Keg < Pathname
       next unless dir.exist?
       dir.find do |src|
         next if src == self
-        dst=HOMEBREW_PREFIX+src.relative_path_from(self)
-        dst.extend ObserverPathnameExtension
+        dst = HOMEBREW_PREFIX + src.relative_path_from(self)
+        dst.extend(ObserverPathnameExtension)
 
         # check whether the file to be unlinked is from the current keg first
         if !dst.symlink? || !dst.exist? || src != dst.resolved_path
@@ -51,7 +51,7 @@ class Keg < Pathname
 
         dst.uninstall_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO']
         dst.unlink
-        dst.parent.rmdir_if_possible
+        dst.parent.extend(ObserverPathnameExtension).rmdir_if_possible
         Find.prune if src.directory?
       end
     end
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index da7a58810a..de6ffa0d84 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -31,7 +31,7 @@ class LinkTests < Test::Unit::TestCase
 
   def test_unlinking_keg
     @keg.link
-    assert_equal 3, @keg.unlink
+    assert_equal 4, @keg.unlink
   end
 
   def test_link_dry_run