diff --git a/src/cmd.c b/src/cmd.c
index 6b75b834d..3eb7d9c37 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	cmd.c	$NHDT-Date: 1658993634 2022/07/28 07:33:54 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.597 $ */
+/* NetHack 3.7	cmd.c	$NHDT-Date: 1661240704 2022/08/23 07:45:04 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.616 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -2086,7 +2086,7 @@ wiz_intrinsic(void)
         }
         if (n >= 1)
             free((genericptr_t) pick_list);
-        doredraw();
+        docrt();
     } else
         pline(unavailcmd, ecname_from_fn(wiz_intrinsic));
     return ECMD_OK;
@@ -4795,8 +4795,10 @@ dxdy_moveok(void)
 boolean
 redraw_cmd(char c)
 {
-    return (boolean) (g.Cmd.commands[(uchar)c]
-                      && g.Cmd.commands[(uchar)c]->ef_funct == doredraw);
+    uchar uc = (uchar) c;
+    const struct ext_func_tab *cmd = g.Cmd.commands[uc];
+
+    return (boolean) (cmd && cmd->ef_funct == doredraw);
 }
 
 /*
diff --git a/src/invent.c b/src/invent.c
index df76ffdba..a1412399b 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	invent.c	$NHDT-Date: 1661202200 2022/08/22 21:03:20 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.423 $ */
+/* NetHack 3.7	invent.c	$NHDT-Date: 1661240719 2022/08/23 07:45:19 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.424 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -5479,7 +5479,7 @@ sync_perminvent(void)
         if (WINDOWPORT(tty))
             perm_invent_toggled(TRUE); /* TRUE means negated */
 #endif
-        (void) doredraw();
+        docrt();
         return;
     }
 
diff --git a/src/save.c b/src/save.c
index a953e5c7c..8ea4cd219 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	save.c	$NHDT-Date: 1654931286 2022/06/11 07:08:06 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.187 $ */
+/* NetHack 3.7	save.c	$NHDT-Date: 1661240721 2022/08/23 07:45:21 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.195 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Michael Allison, 2009. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -68,7 +68,7 @@ dosave(void)
             exit_nhwindows("Be seeing you...");
             nh_terminate(EXIT_SUCCESS);
         } else
-            (void) doredraw();
+            docrt();
     }
     return ECMD_OK;
 }