diff --git a/src/vim9execute.c b/src/vim9execute.c
index ba81068..c947d6a 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1007,7 +1007,7 @@
 	return call_bfunc(func_idx, argcount, ectx);
     }
 
-    ufunc = find_func(name, FALSE, NULL);
+    ufunc = find_func(name, FALSE);
 
     if (ufunc == NULL)
     {
@@ -1015,7 +1015,7 @@
 
 	if (script_autoload(name, TRUE))
 	    // loaded a package, search for the function again
-	    ufunc = find_func(name, FALSE, NULL);
+	    ufunc = find_func(name, FALSE);
 
 	if (vim9_aborting(prev_uncaught_emsg))
 	    return FAIL;  // bail out if loading the script caused an error
@@ -3319,7 +3319,7 @@
 		    }
 		    else
 		    {
-			ufunc = find_func(funcref->fr_func_name, FALSE, NULL);
+			ufunc = find_func(funcref->fr_func_name, FALSE);
 		    }
 		    if (ufunc == NULL)
 		    {
@@ -6039,14 +6039,14 @@
 	return;
     }
 
-    ufunc = find_func(fname, is_global, NULL);
+    ufunc = find_func(fname, is_global);
     if (ufunc == NULL)
     {
 	char_u *p = untrans_function_name(fname);
 
 	if (p != NULL)
 	    // Try again without making it script-local.
-	    ufunc = find_func(p, FALSE, NULL);
+	    ufunc = find_func(p, FALSE);
     }
     vim_free(fname);
     if (ufunc == NULL)
