diff --git a/builtin_set.c b/builtin_set.c
index 9c655309a..8aabc4031 100644
--- a/builtin_set.c
+++ b/builtin_set.c
@@ -274,8 +274,6 @@ static int is_path_variable( const wchar_t *env )
 	return contains_str( env,
 						 L"PATH",
 						 L"CDPATH",
-						 L"fish_function_path",
-						 L"fish_completion_path",
 						 (void *)0 );
 }
 
diff --git a/share/fish.in b/share/fish.in
index a74e7438d..09d2961c8 100644
--- a/share/fish.in
+++ b/share/fish.in
@@ -18,7 +18,7 @@ if test "$USER" = root
 end
 
 for i in $path_list
-	if not expr "$PATH" : .\*$i.\* >/dev/null
+	if not expr "$PATH" : "$i/*" >/dev/null
 		if test -d $i
 			set PATH $PATH $i
 		end
@@ -43,8 +43,8 @@ end
 # Convenience functions
 #
 # The naming heuristic is that __fish_complete_* prints completions
-# and descriptions, while __fish_print_* only prints the completion,
-# without the description
+# and descriptions, while __fish_print_* only prints the completions
+# and no descriptions
 #
 
 function __fish_complete_users -d "Print a list of local users, with the real user name as a description"