diff --git a/fisher.fish b/fisher.fish
index c8f1733..42d1acc 100644
--- a/fisher.fish
+++ b/fisher.fish
@@ -324,16 +324,13 @@ function _fisher_pkg_uninstall -a pkg
         set -l filename (echo "$target" | command sed 's|.fish||')
         switch $source
             case $pkg/conf.d\*
-                if test "$filename.fish" = "$target"
-                    emit "$filename"_uninstall
-                end
+                test "$filename.fish" = "$target"; and emit "$filename"_uninstall
                 set target conf.d/$target
             case $pkg/completions\*
-                if functions -q "$filename"
-                    complete -ec $filename
-                end
+                test "$filename.fish" = "$target"; and complete -ec $filename
                 set target completions/$target
             case $pkg/{,functions}\*
+                test "$filename.fish" = "$target"; and functions -e $filename
                 switch $target
                     case uninstall.fish
                         source $source
@@ -343,9 +340,6 @@ function _fisher_pkg_uninstall -a pkg
                     case \*
                         set target functions/$target
                 end
-                if functions -q "$filename"
-                    functions -e $filename
-                end
         end
         command rm -f $fisher_path/$target
     end