diff --git a/src/helper/command.h b/src/helper/command.h
index f9c02e573..9aed2827c 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -121,6 +121,11 @@ struct command_invocation {
  */
 #define COMMAND_HELPER(name, extra ...) __COMMAND_HANDLER(name, extra)
 
+/**
+ * Use this macro to access the command being handled,
+ * rather than accessing the variable directly.  It may be moved.
+ */
+#define CMD (cmd)
 /**
  * Use this macro to access the context of the command being handled,
  * rather than accessing the variable directly.  It may be moved.