diff --git a/src/evalfunc.c b/src/evalfunc.c
index 41133091d5..72dc557f91 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -331,6 +331,7 @@ argcheck_T arg3_insert[] = {arg_list_or_blob, arg_item_of_prev, arg_number};
 
 /*
  * Functions that return the return type of a builtin function.
+ * Note that "argtypes" is NULL if "argcount" is zero.
  */
     static type_T *
 ret_void(int argcount UNUSED, type_T **argtypes UNUSED)
@@ -1825,6 +1826,11 @@ internal_func_check_arg_types(type_T **types, int idx, int argcount)
     return OK;
 }
 
+/*
+ * Call the "f_retfunc" function to obtain the return type of function "idx".
+ * "argtypes" is the list of argument types or NULL when there are no
+ * arguments.
+ */
     type_T *
 internal_func_ret_type(int idx, int argcount, type_T **argtypes)
 {
diff --git a/src/version.c b/src/version.c
index 720dc3a83c..56bf8f665b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1884,
 /**/
     1883,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 7ae47b393d..58f4db9b72 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1460,7 +1460,7 @@ generate_BCALL(cctx_T *cctx, int func_idx, int argcount, int method_call)
     isn_T	*isn;
     garray_T	*stack = &cctx->ctx_type_stack;
     int		argoff;
-    type_T	**argtypes;
+    type_T	**argtypes = NULL;
 
     RETURN_OK_IF_SKIP(cctx);
     argoff = check_internal_func(func_idx, argcount);