diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 0ab170e..4c821ec 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -707,8 +707,7 @@
       return valtwo
     enddef
   END
-  writefile(lines + morelines,
-            'Xreload.vim')
+  writefile(lines + morelines, 'Xreload.vim')
   source Xreload.vim
   source Xreload.vim
   source Xreload.vim
@@ -724,10 +723,9 @@
   writefile(testlines, 'Ximport.vim')
   source Ximport.vim
 
-  " test that when not using "morelines" valtwo is still defined
-  " need to source Xreload.vim again, import doesn't reload a script
+  " Test that when not using "morelines" GetValtwo() and valtwo are still
+  " defined, because import doesn't reload a script.
   writefile(lines, 'Xreload.vim')
-  source Xreload.vim
   source Ximport.vim
 
   " cannot declare a var twice
@@ -750,36 +748,36 @@
       return 'yes'
     enddef
   END
-  let middle_lines =<< trim END
+  let withno_lines =<< trim END
     def FuncNo(): string
       return 'no'
     enddef
-  END
-  let final_lines =<< trim END
     def g:DoCheck(no_exists: bool)
       assert_equal('yes', FuncYes())
-      if no_exists
-        assert_equal('no', FuncNo())
-      else
-        assert_fails('call FuncNo()', 'E117:')
-      endif
+      assert_equal('no', FuncNo())
+    enddef
+  END
+  let nono_lines =<< trim END
+    def g:DoCheck(no_exists: bool)
+      assert_equal('yes', FuncYes())
+      assert_fails('call FuncNo()', 'E117:')
     enddef
   END
 
   # FuncNo() is defined
-  writefile(first_lines + middle_lines + final_lines, 'Xreloaded.vim')
+  writefile(first_lines + withno_lines, 'Xreloaded.vim')
   source Xreloaded.vim
   g:DoCheck(true)
 
   # FuncNo() is not redefined
-  writefile(first_lines + final_lines, 'Xreloaded.vim')
+  writefile(first_lines + nono_lines, 'Xreloaded.vim')
   source Xreloaded.vim
-  g:DoCheck(false)
+  g:DoCheck()
 
   # FuncNo() is back
-  writefile(first_lines + middle_lines + final_lines, 'Xreloaded.vim')
+  writefile(first_lines + withno_lines, 'Xreloaded.vim')
   source Xreloaded.vim
-  g:DoCheck(true)
+  g:DoCheck()
 
   delete('Xreloaded.vim')
 enddef
diff --git a/src/userfunc.c b/src/userfunc.c
index 86dea79..708b452 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1599,9 +1599,9 @@
     for (hi = func_hashtab.ht_array; todo > 0; ++hi)
 	if (!HASHITEM_EMPTY(hi))
 	{
+	    fp = HI2UF(hi);
 	    if (STRNCMP(fp->uf_name, buf, len) == 0)
 	    {
-		fp = HI2UF(hi);
 		fp->uf_flags |= FC_DEAD;
 		func_clear(fp, TRUE);
 	    }
diff --git a/src/version.c b/src/version.c
index f9951e9..9bee513 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    653,
+/**/
     652,
 /**/
     651,