From 9fdd0bdd384d97d24cb8e34b441c47eed2e90f75 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Tue, 18 Nov 2014 16:19:01 +0200
Subject: [PATCH] Tweak format of command help files and do some further
 command cleanup

---
 include/core/emustatus.hpp            |   5 +-
 include/core/queue.hpp                |  11 +++-
 include/library/command.hpp           |   7 +++
 include/lua/lua.hpp                   |   7 +++
 src/cmdhelp/action.json               |   7 +++
 src/cmdhelp/button.json               |  95 ++++++++++++----------------
 src/cmdhelp/commentary.json           |  23 +++----
 src/cmdhelp/debug.json                |  39 ++++++------
 src/cmdhelp/disassemble.json          |   7 +++
 src/cmdhelp/framebuffer.json          |  10 +--
 src/cmdhelp/jukebox.json              |  37 +++++------
 src/cmdhelp/keymapper.json            |  11 ++++
 src/cmdhelp/libao-sound.json          |   7 +++
 src/cmdhelp/loadlib.json              |  15 +++++
 src/cmdhelp/loadsave.json             | 113 +++++++++++++++++++++++++++++-----
 src/cmdhelp/lua.json                  |  23 +++++++
 src/cmdhelp/macro.json                |  39 ++++++------
 src/cmdhelp/mhold.json                |  39 +++++-------
 src/cmdhelp/mkstubs.cpp               |  50 ++++++++-------
 src/cmdhelp/mkstubsi.cpp              |  19 +++---
 src/cmdhelp/moviedata.json            |  11 ++++
 src/cmdhelp/multitrack.json           |  36 +++++------
 src/cmdhelp/project.json              |  65 ++++++++-----------
 src/cmdhelp/sound.json                |  36 +++++++++++
 src/cmdhelp/subtitles.json            |  36 +++++------
 src/cmdhelp/turbo.json                |  39 +++++-------
 src/core/actions.cpp                  |   4 +-
 src/core/controller.cpp               |  36 +++++------
 src/core/controllerframe.cpp          |  39 +++++++++++-
 src/core/debug.cpp                    |   6 +-
 src/core/disassemble.cpp              |   4 +-
 src/core/emustatus.cpp                |   6 +-
 src/core/framebuffer.cpp              |   2 +-
 src/core/framerate.cpp                |   6 +-
 src/core/instance.cpp                 |   2 +-
 src/core/inthread.cpp                 |   4 +-
 src/core/jukebox.cpp                  |   6 +-
 src/core/keymapper.cpp                |   7 +--
 src/core/loadlib.cpp                  |  11 +++-
 src/core/mainloop.cpp                 |  87 ++++++++------------------
 src/core/misc.cpp                     |  34 ----------
 src/core/moviedata.cpp                |  10 ++-
 src/core/multitrack.cpp               |   6 +-
 src/core/project.cpp                  |  17 ++---
 src/core/queue.cpp                    |  16 ++++-
 src/core/subtitles.cpp                |   6 +-
 src/core/ui-services.cpp              |   3 +-
 src/core/window.cpp                   |  25 +++-----
 src/library/command.cpp               |  37 ++++++++---
 src/lua/lua.cpp                       |  63 +++++++------------
 src/lua/memory.cpp                    |   3 +-
 src/platform/libao/sound.cpp          |   3 +-
 src/platform/wxwidgets/mainwindow.cpp |  29 +++++----
 53 files changed, 710 insertions(+), 549 deletions(-)
 create mode 100644 src/cmdhelp/action.json
 rewrite src/cmdhelp/button.json (99%)
 rewrite src/cmdhelp/debug.json (99%)
 create mode 100644 src/cmdhelp/disassemble.json
 create mode 100644 src/cmdhelp/keymapper.json
 create mode 100644 src/cmdhelp/libao-sound.json
 create mode 100644 src/cmdhelp/loadlib.json
 create mode 100644 src/cmdhelp/lua.json
 rewrite src/cmdhelp/macro.json (99%)
 rewrite src/cmdhelp/mhold.json (99%)
 create mode 100644 src/cmdhelp/moviedata.json
 rewrite src/cmdhelp/multitrack.json (99%)
 rewrite src/cmdhelp/project.json (99%)
 create mode 100644 src/cmdhelp/sound.json
 rewrite src/cmdhelp/subtitles.json (99%)
 rewrite src/cmdhelp/turbo.json (99%)

diff --git a/include/core/emustatus.hpp b/include/core/emustatus.hpp
index f75eb584..550a85b5 100644
--- a/include/core/emustatus.hpp
+++ b/include/core/emustatus.hpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <set>
 #include <map>
+#include "library/command.hpp"
 #include "library/triplebuffer.hpp"
 
 class movie_logic;
@@ -57,13 +58,15 @@ struct _lsnes_status
 
 struct slotinfo_cache
 {
-	slotinfo_cache(movie_logic& _mlogic);
+	slotinfo_cache(movie_logic& _mlogic, command::group& _cmd);
 	std::string get(const std::string& _filename);
 	void flush(const std::string& _filename);
 	void flush();
 private:
 	std::map<std::string, std::string> cache;
 	movie_logic& mlogic;
+	command::group& cmd;
+	command::_fnptr<> flushcmd;
 };
 
 struct status_updater
diff --git a/include/core/queue.hpp b/include/core/queue.hpp
index 947d4c40..63209f1d 100644
--- a/include/core/queue.hpp
+++ b/include/core/queue.hpp
@@ -65,7 +65,7 @@ struct input_queue
 	threads::lock queue_lock;
 	threads::cv queue_condition;
 	std::deque<keypress_info> keypresses;
-	std::deque<std::string> commands;
+	std::deque<std::pair<const char*, std::string>> commands;
 	std::deque<function_queue_entry> functions;
 	volatile uint64_t functions_executed;
 	volatile uint64_t next_function;
@@ -92,6 +92,15 @@ struct input_queue
  */
 	void queue(const std::string& c) throw(std::bad_alloc);
 /**
+ * Queue command and arguments.
+ *
+ * - Can be called from any thread.
+ *
+ * Parameter c: The command to queue.
+ * Parameter a: The arguments for function.
+ */
+	void queue(const char* c, const std::string& a) throw(std::bad_alloc);
+/**
  * Queue function to be called in emulation thread.
  *
  * - Can be called from any thread (exception: Synchronous mode can not be used from emulation nor main threads).
diff --git a/include/library/command.hpp b/include/library/command.hpp
index b6612a19..c8c3cbe9 100644
--- a/include/library/command.hpp
+++ b/include/library/command.hpp
@@ -96,6 +96,13 @@ public:
  */
 	void invoke(const std::string& cmd) throw();
 /**
+ * Look up and invoke a command. No alias expansion is performed, but recursion checking is.
+ *
+ * parameter cmd: Command to execute.
+ * parameter args: The parameters for command.
+ */
+	void invoke(const std::string& cmd, const std::string& args) throw();
+/**
  * Get set of aliases.
  */
 	std::set<std::string> get_aliases() throw(std::bad_alloc);
diff --git a/include/lua/lua.hpp b/include/lua/lua.hpp
index b2ea6f41..7003d333 100644
--- a/include/lua/lua.hpp
+++ b/include/lua/lua.hpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <list>
 #include "core/controllerframe.hpp"
+#include "library/command.hpp"
 #include "library/movie.hpp"
 #include "library/framebuffer.hpp"
 #include "library/lua-base.hpp"
@@ -106,6 +107,8 @@ struct lua_state
 	std::list<std::string> startup_scripts;
 	std::map<std::string, std::u32string> watch_vars;
 private:
+	void do_reset();
+	void do_evaluate(const std::string& a);
 	bool run_lua_fragment() throw(std::bad_alloc);
 	template<typename... T> bool run_callback(lua::state::callback_list& list, T... args);
 	void run_synchronous_paint(struct lua::render_context* ctx);
@@ -113,6 +116,10 @@ private:
 	command::group& command;
 	bool recursive_flag;
 	const char* luareader_fragment;
+	command::_fnptr<> resetcmd;
+	command::_fnptr<const std::string&> evalcmd;
+	command::_fnptr<const std::string&> evalcmd2;
+	command::_fnptr<command::arg_filename> runcmd;
 };
 
 #endif
diff --git a/src/cmdhelp/action.json b/src/cmdhelp/action.json
new file mode 100644
index 00000000..2b4276b6
--- /dev/null
+++ b/src/cmdhelp/action.json
@@ -0,0 +1,7 @@
+{
+	"__mod":"CACTION",
+	"action":[
+		"e", "Execute core action",
+		{"<name> [<params>...]":"Executes core action."}
+	]
+}
diff --git a/src/cmdhelp/button.json b/src/cmdhelp/button.json
dissimilarity index 99%
index ebbb079e..52e974ec 100644
--- a/src/cmdhelp/button.json
+++ b/src/cmdhelp/button.json
@@ -1,56 +1,39 @@
-{
-	"btnp":{
-		"__class":"button",
-		"__name":"+controller",
-		"__description":"Press a button",
-		"<button>":"Press button <button>"
-	},
-	"btnr":{
-		"__class":"button",
-		"__name":"-controller",
-		"__description":"Release a button",
-		"<button>":"Release button <button>"
-	},
-	"btnh":{
-		"__class":"button",
-		"__name":"hold-controller",
-		"__description":"Autohold a button",
-		"<button>":"Autohold button <button>"
-	},
-	"btnt":{
-		"__class":"button",
-		"__name":"type-controller",
-		"__description":"Type a button",
-		"<button>":"Type button <button>"
-	},
-	"btnd":{
-		"__class":"button",
-		"__name":"designate-position",
-		"__description":"Set postion",
-		"<button>":"Designate position for an axis"
-	},
-	"btnap":{
-		"__class":"button",
-		"__name":"+autofire-controller",
-		"__description":"Start autofire",
-		"<button> [[<duty> ]<cyclelen>]":"Autofire button <button> with duty <duty> out of <cyclelen>"
-	},
-	"btnar":{
-		"__class":"button",
-		"__name":"-autofire-controller",
-		"__description":"End autofire",
-		"<button> [[<duty> ]<cyclelen>]":"End Autofire on button <button>"
-	},
-	"btnat":{
-		"__class":"button",
-		"__name":"autofire-controller",
-		"__description":"Toggle autofire",
-		"<button> [[<duty> ]<cyclelen>]":"Toggle Autofire on button <button> with duty <duty> out of <cyclelen>"
-	},
-	"btna":{
-		"__class":"button",
-		"__name":"controller-analog",
-		"__description":"Analog action",
-		"<button> <axisvalue>":"Analog action on <button> with value <axisvalue>"
-	}
-}
+{
+	"__mod":"CBUTTON",
+	"+controller":[
+		"p", "Press a button",
+		{"<button>":"Press button <button>"}
+	],
+	"-controller":[
+		"r", "Release a button",
+		{"<button>":"Release button <button>"}
+	],
+	"hold-controller":[
+		"h", "Autohold a button",
+		{"<button>":"Autohold button <button>"}
+	],
+	"type-controller":[
+		"t", "Type a button",
+		{"<button>":"Type button <button>"}
+	],
+	"designate-position":[
+		"d", "Set postion",
+		{"<button>":"Designate position for an axis"}
+	],
+	"+autofire-controller":[
+		"ap", "Start autofire",
+		{"<button> [[<duty> ]<cyclelen>]":"Autofire button <button> with duty <duty> out of <cyclelen>"}
+	],
+	"-autofire-controller":[
+		"ar", "End autofire",
+		{"<button> [[<duty> ]<cyclelen>]":"End Autofire on button <button>"}
+	],
+	"autofire-controller":[
+		"at", "Toggle autofire",
+		{"<button> [[<duty> ]<cyclelen>]":"Toggle Autofire on button <button> with duty <duty> out of <cyclelen>"}
+	],
+	"controller-analog":[
+		"a", "Analog action",
+		{"<button> <axisvalue>":"Analog action on <button> with value <axisvalue>"}
+	]
+}
diff --git a/src/cmdhelp/commentary.json b/src/cmdhelp/commentary.json
index d66c8bc6..c0ac8b1f 100644
--- a/src/cmdhelp/commentary.json
+++ b/src/cmdhelp/commentary.json
@@ -1,15 +1,12 @@
 {
-	"tangentp":{
-		"__class":"commentary",
-		"__name":"+tangent",
-		"__description":"Voice tangent",
-		"":"Voice tangent",
-		"__inverse":{"":"Movie‣Voice tangent"}
-	},
-	"tangentr":{
-		"__class":"commentary",
-		"__name":"-tangent",
-		"__description":"Voice tangent",
-		"":"Voice tangent."
-	}
+	"__mod":"CCOMMENTARY",
+	"+tangent":[
+		"p", "Voice tangent enage",
+		{"":"Voice tangent enage"},
+		{"":"Movie‣Voice tangent"}
+	],
+	"-tangent":[
+		"r", "Voice tangent disenage",
+		{"":"Voice tangent disenage."}
+	]
 }
diff --git a/src/cmdhelp/debug.json b/src/cmdhelp/debug.json
dissimilarity index 99%
index 486c67fe..1730eff9 100644
--- a/src/cmdhelp/debug.json
+++ b/src/cmdhelp/debug.json
@@ -1,21 +1,18 @@
-{
-	"showhooks":{
-		"__class":"debug",
-		"__name":"show-callbacks",
-		"__description":"Show debug callbacks",
-		"":"Shows debugging callbacks"
-	},
-	"genevent":{
-		"__class":"debug",
-		"__name":"generate-memory-event",
-		"__description":"Inject a debugging event",
-		"<type> <addr> <value>":"Inject a debugging event with given <type>, <addr> and <value>"
-	},
-	"trace":{
-		"__class":"debug",
-		"__name":"tracelog",
-		"__description":"Trace log control",
-		"<cpuid> <file>":"Start tracing <cpuid> to <file>",
-		"<cpuid>":"End tracing <cpuid>"
-	}
-}
+{
+	"__mod":"CDEBUG",
+	"show-callbacks":[
+		"scb", "Show debug callbacks",
+		{"":"Shows debugging callbacks"}
+	],
+	"generate-memory-event":[
+		"genevt", "Inject a debugging event",
+		{"<type> <addr> <value>":"Inject a debugging event with given <type>, <addr> and <value>"}
+	],
+	"tracelog":[
+		"tr", "Trace log control",
+		{
+			"<cpuid> <file>":"Start tracing <cpuid> to <file>",
+			"<cpuid>":"End tracing <cpuid>"
+		}
+	]
+}
diff --git a/src/cmdhelp/disassemble.json b/src/cmdhelp/disassemble.json
new file mode 100644
index 00000000..95c60137
--- /dev/null
+++ b/src/cmdhelp/disassemble.json
@@ -0,0 +1,7 @@
+{
+	"__mod":"CDISASM",
+	"disassemble":[
+		"d", "Disassemble code",
+		{"<kind> <addr> [<count>] [to <filename>]":"Disassemble code"}
+	]
+}
diff --git a/src/cmdhelp/framebuffer.json b/src/cmdhelp/framebuffer.json
index 383e32d9..16c6b69e 100644
--- a/src/cmdhelp/framebuffer.json
+++ b/src/cmdhelp/framebuffer.json
@@ -1,7 +1,7 @@
 {
-	"screenshot":{
-		"__name":"take-screenshot",
-		"__description":"Takes a screenshot",
-		"<file>":"Save a screenshot to PNG file <file>"
-	}
+	"__mod":"CFRAMEBUF",
+	"take-screenshot":[
+		"ss", "Takes a screenshot",
+		{"<file>":"Save a screenshot to PNG file <file>"}
+	]
 }
diff --git a/src/cmdhelp/jukebox.json b/src/cmdhelp/jukebox.json
index c744c950..d1772ddf 100644
--- a/src/cmdhelp/jukebox.json
+++ b/src/cmdhelp/jukebox.json
@@ -1,10 +1,9 @@
 {
-	"slotselect":{
-		"__class":"jukebox",
-		"__name":"set-jukebox-slot",
-		"__description":"Set jukebox slot",
-		"<slot>":"Set jukebox slot to <slot>\n",
-		"__inverse":{
+	"__mod":"CJUKEBOX",
+	"set-jukebox-slot":[
+		"sel", "Set jukebox slot",
+		{"<slot>":"Set jukebox slot to <slot>\n"},
+		{
 			"1":"Slot select‣Slot 1",
 			"2":"Slot select‣Slot 2",
 			"3":"Slot select‣Slot 3",
@@ -38,19 +37,15 @@
 			"31":"Slot select‣Slot 31",
 			"32":"Slot select‣Slot 32"
 		}
-	},
-	"slotprev":{
-		"__class":"jukebox",
-		"__name":"cycle-jukebox-backward",
-		"__description":"Cycle save jukebox backwards",
-		"":"Cycle save jukebox backwards",
-		"__inverse":{"":"Slot select‣Cycle backwards"}
-	},
-	"slotnext":{
-		"__class":"jukebox",
-		"__name":"cycle-jukebox-forward",
-		"__description":"Cycle save jukebox forwards",
-		"":"Cycle save jukebox forwards",
-		"__inverse":{"":"Slot select‣Cycle forwards"}
-	}
+	],
+	"cycle-jukebox-backward":[
+		"prev", "Cycle save jukebox backwards",
+		{"":"Cycle save jukebox backwards"},
+		{"":"Slot select‣Cycle backwards"}
+	],
+	"cycle-jukebox-forward":[
+		"next", "Cycle save jukebox forwards",
+		{"":"Cycle save jukebox forwards"},
+		{"":"Slot select‣Cycle forwards"}
+	]
 }
diff --git a/src/cmdhelp/keymapper.json b/src/cmdhelp/keymapper.json
new file mode 100644
index 00000000..85873812
--- /dev/null
+++ b/src/cmdhelp/keymapper.json
@@ -0,0 +1,11 @@
+{
+	"__mod":"CKEYMAPPER",
+	"show-joysticks":[
+		"show", "Show joystick info",
+		{"":"Show joystick info."}
+	],
+	"reset-gamepads":[
+		"reset", "Reset gamepads",
+		{"":"Resets gamepads."}
+	]
+}
diff --git a/src/cmdhelp/libao-sound.json b/src/cmdhelp/libao-sound.json
new file mode 100644
index 00000000..0a26179d
--- /dev/null
+++ b/src/cmdhelp/libao-sound.json
@@ -0,0 +1,7 @@
+{
+	"__mod":"CLIBAOSND",
+	"libao-set-id":[
+		"setid", "Set sound device id",
+		{"<id>":"Set sound device id to <id>"}
+	]
+}
diff --git a/src/cmdhelp/loadlib.json b/src/cmdhelp/loadlib.json
new file mode 100644
index 00000000..2f39652c
--- /dev/null
+++ b/src/cmdhelp/loadlib.json
@@ -0,0 +1,15 @@
+{
+	"__mod":"CLOADLIB",
+	"load-library":[
+		"load", "Load a library",
+		{"<filename>":"Load a shared library from <filename>."}
+	],
+	"unload-library":[
+		"unload", "Unload a library",
+		{"<id>":"Unload shared library with id <id> (DANGEROUS)."}
+	],
+	"list-libraries":[
+		"list", "List loaded shared libraries",
+		{"":"List loaded shared libraries"}
+	]
+}
diff --git a/src/cmdhelp/loadsave.json b/src/cmdhelp/loadsave.json
index ab071ce6..9b4b7eb0 100644
--- a/src/cmdhelp/loadsave.json
+++ b/src/cmdhelp/loadsave.json
@@ -1,10 +1,9 @@
 {
-	"load":{
-		"__class":"loadsave",
-		"__name":"load",
-		"__description":"Load savestate (current mode)",
-		"<file>":"Loads SNES state from <file> in current mode",
-		"__inverse":{
+	"__mod":"CLOADSAVE",
+	"load":[
+		"ld", "Load savestate (current mode)",
+		{"<file>":"Load state from <file> in current mode"},
+		{
 			"$SLOT:1":"Load‣Slot 1",
 			"$SLOT:2":"Load‣Slot 2",
 			"$SLOT:3":"Load‣Slot 3",
@@ -38,13 +37,11 @@
 			"$SLOT:31":"Load‣Slot 31",
 			"$SLOT:32":"Load‣Slot 32"
 		}
-	},
-	"savestate":{
-		"__class":"loadsave",
-		"__name":"save-state",
-		"__description":"Save state",
-		"<file>":"Saves SNES state to <file>",
-		"__inverse":{
+	],
+	"save-state":[
+		"sa", "Save state",
+		{"<file>":"Save state to <file>"},
+		{
 			"$SLOT:1":"Save‣Slot 1",
 			"$SLOT:2":"Save‣Slot 2",
 			"$SLOT:3":"Save‣Slot 3",
@@ -78,5 +75,93 @@
 			"$SLOT:31":"Save‣Slot 31",
 			"$SLOT:32":"Save‣Slot 32"
 		}
-	}
+	],
+	"load-jukebox":[
+		"ldj", "Load selected slot",
+		{"":"Load selected slot"},
+		{"":"Load‣Selected slot"}
+	],
+	"load-jukebox-readwrite":[
+		"ldjrw", "Load selected slot in recording mode",
+		{"":"Load selected slot in recording mode"},
+		{"":"Load‣Selected slot (recording mode)"}
+	],
+	"load-jukebox-readonly":[
+		"ldjro", "Load current slot in playback mode",
+		{"":"Load current slot in playback mode"},
+		{"":"Load‣Selected slot (playback mode)"}
+	],
+	"load-jukebox-preserve":[
+		"ldjp", "Load current slot, preserving input",
+		{"":"Load current slot, preserving input"},
+		{"":"Load‣Selected slot (preserve input)"}
+	],
+	"load-jukebox-movie":[
+		"ldjm", "Load current slot as movie",
+		{"":"Load current slot as movie"},
+		{"":"Load‣Selected slot (as movie)"}
+	],
+	"save-jukebox":[
+		"saj", "Save current slot",
+		{"":"Save current slot"},
+		{"":"Save‣Selected slot"}
+	],
+	"load-smart":[
+		"ldsm", "Load savestate (heuristic mode)",
+		{"<file>":"Load state from <file> in heuristic mode"}
+	],
+	"load-state":[
+		"ldrw", "Load savestate (R/W)",
+		{"<file>":"Load state from <file> in Read/Write mode"}
+	],
+	"load-readonly":[
+		"ldro", "Load savestate (RO)",
+		{"<file>":"Load state from <file> in playback mode"}
+	],
+	"load-preserve":[
+		"ldp", "Load savestate (preserve input)",
+		{"<file>":"Load state from <file> preserving input"}
+	],
+	"load-movie":[
+		"ldm", "Load movie",
+		{"<file>":"Load movie from <file>"}
+	],
+	"load-allbranches":[
+		"ldab", "Load savestate (all branches)",
+		{"<file>":"Load state from <file> with all branches"}
+	],
+	"save-state-binary":[
+		"sasb",  "Save state (binary)",
+		{"<file>":"Save state to <file> in binary format"}
+	],
+	"save-state-zip":[
+		"sasz", "Save state (zip)",
+		{"<file>":"Save state to <file> in zip format"}
+	],
+	"save-movie":[
+		"sam", "Save movie",
+		{"<file>":"Save movie to <file>"}
+	],
+	"save-movie-binary":[
+		"samb", "Save movie (binary)",
+		{"<file>":"Save movie to <file> in binary format"}
+	],
+	"save-movie-zip":[
+		"samz", "Save movie (zip)",
+		{"<file>":"Save movie to <file> in zip format"}
+	],
+	"rewind-movie":[
+		"rewind", "Rewind movie to the beginning",
+		{"":"Rewind movie to the beginning"},
+		{"":"Movie‣Rewind movie"}
+	],
+	"cancel-saves":[
+		"cancel", "Cancel all pending saves",
+		{"":"Cancel pending saves"},
+		{"":"Save‣Cancel pending saves"}
+	],
+	"flush-slotinfo":[
+		"flushslots", "Flush slotinfo cache",
+		{"":"Flush slotinfo cache"}
+	]
 }
diff --git a/src/cmdhelp/lua.json b/src/cmdhelp/lua.json
new file mode 100644
index 00000000..ce70d8cf
--- /dev/null
+++ b/src/cmdhelp/lua.json
@@ -0,0 +1,23 @@
+{
+	"__mod":"CLUA",
+	"reset-lua":[
+		"reset", "Reset the Lua VM",
+		{"":"Reset the Lua VM."}
+	],
+	"run-lua":[
+		"run", "Run Lua script in Lua VM",
+		{"<file>":"Runs <file> in Lua VM."}
+	],
+	"L":[
+		"eval", "Evaluate expression in Lua VM",
+		{"<expression>":"Evaluates <expression> in Lua VM."}
+	],
+	"evaluate-lua":[
+		"eval2", "Evaluate expression in Lua VM",
+		{"<expression>":"Evaluates <expression> in Lua VM."}
+	],
+	"show-lua-callbacks":[
+		"scb", "Show active Lua debug callbacks",
+		{"":"Show active Lua debug callbacks"}
+	]
+}
diff --git a/src/cmdhelp/macro.json b/src/cmdhelp/macro.json
dissimilarity index 99%
index 8797cd8f..a64c5845 100644
--- a/src/cmdhelp/macro.json
+++ b/src/cmdhelp/macro.json
@@ -1,20 +1,19 @@
-{
-	"macrot":{
-		"__class":"macro",
-		"__name":"macro",
-		"__description":"Toggle a macro",
-		"<macroname>":"Toggle macro <macroname>."
-	},
-	"macrop":{
-		"__class":"macro",
-		"__name":"+macro",
-		"__description":"Enable a macro",
-		"<macroname>":"Enable macro <macroname>."
-	},
-	"macror":{
-		"__class":"macro",
-		"__name":"-macro",
-		"__description":"Disable a macro",
-		"<macroname>":"Disable macro <macroname>."
-	}
-}
+{
+	"__mod":"CMACRO",
+	"macro":[
+		"t", "Toggle a macro",
+		{"<macroname>":"Toggle macro <macroname>."}
+	],
+	"+macro":[
+		"p", "Enable a macro",
+		{"<macroname>":"Enable macro <macroname>."}
+	],
+	"-macro":[
+		"r", "Disable a macro",
+		{"<macroname>":"Disable macro <macroname>."}
+	],
+	"test-macro":[
+		"test", "Test a macro (for debugging)",
+		{"<lcid> <macro>":"Show macro parse result for <macro> on controller <lcid>."}
+	]
+}
diff --git a/src/cmdhelp/mhold.json b/src/cmdhelp/mhold.json
dissimilarity index 99%
index 9c31dae4..666df22b 100644
--- a/src/cmdhelp/mhold.json
+++ b/src/cmdhelp/mhold.json
@@ -1,22 +1,17 @@
-{
-	"mholdp":{
-		"__class":"mhold",
-		"__name":"+hold-macro",
-		"__description":"Hold macro (hold)",
-		"":"Hold macros enable",
-		"__inverse":{"":"Macro‣Hold all macros"}
-	},
-	"mholdr":{
-		"__class":"mhold",
-		"__name":"-hold-macro",
-		"__description":"Hold macro (hold)",
-		"":"Hold macros disable"
-	},
-	"mholdt":{
-		"__class":"mhold",
-		"__name":"hold-macro",
-		"__description":"Hold macro (typed)",
-		"":"Hold macros typed",
-		"__inverse":{"":"Macro‣Hold all macros (typed)"}
-	}
-}
+{
+	"__mod":"CMHOLD",
+	"+hold-macro":[
+		"p", "Hold all macro enable (hold)",
+		{"":"Hold macros enable"},
+		{"":"Macro‣Hold all macros"}
+	],
+	"-hold-macro":[
+		"r", "Hold all macro disable (hold)",
+		{"":"Hold macros disable"}
+	],
+	"hold-macro":[
+		"t", "Hold all macros for one frame",
+		{"":"Hold macros typed"},
+		{"":"Macro‣Hold all macros for one frame"}
+	]
+}
diff --git a/src/cmdhelp/mkstubs.cpp b/src/cmdhelp/mkstubs.cpp
index f045dfb7..cfd519fd 100644
--- a/src/cmdhelp/mkstubs.cpp
+++ b/src/cmdhelp/mkstubs.cpp
@@ -6,9 +6,9 @@
 
 const char* hexes = "0123456789abcdef";
 
-std::string quote_c_string(const std::string& raw, bool hiraw = false);
+std::string quote_c_string(const std::string& raw);
 
-std::string quote_c_string(const std::string& raw, bool hiraw)
+std::string quote_c_string(const std::string& raw)
 {
 	std::ostringstream out;
 	out << "\"";
@@ -20,7 +20,7 @@ std::string quote_c_string(const std::string& raw, bool hiraw)
 			out << "\\\"";
 		else if(ch == '\\')
 			out << "\\\\";
-		else if(ch < 32 || ch == 127 || (ch > 127 && !hiraw))
+		else if(ch < 32 || ch > 126)
 			out << "\\x" << hexes[ch / 16] << hexes[ch % 16];
 		else
 			out << ch;
@@ -82,27 +82,29 @@ std::string quote_help(const std::u32string& raw)
 
 void process_command(const std::string& name, JSON::node& n, std::ostream& hdr, std::ostream& imp)
 {
-	hdr << "extern command::stub " << name << ";" << std::endl;
-	imp << "command::stub " << name << " = {" << std::endl;
-	std::string cmdname = n["__name"].as_string8();
-	std::string desc = n.field_exists("__description") ? n["__description"].as_string8() :
+	if(name == "__mod")
+		return;
+	std::string cmdsym = n.index(0).as_string8();
+	hdr << "extern command::stub " << cmdsym << ";" << std::endl;
+	imp << "command::stub " << cmdsym << " = {" << std::endl;
+	std::string desc = (n.index_count() >= 2) ? n.index(1).as_string8() :
 		"No description available";
-	imp << "\t" << quote_c_string(cmdname) << ", " << quote_c_string(desc) << "," << std::endl;
+	imp << "\t" << quote_c_string(name) << ", " << quote_c_string(desc) << "," << std::endl;
 	bool first = true;
-	for(auto i = n.begin(); i != n.end(); i++) {
-		std::string hleafname = i.key8();
-		if(hleafname == "__name" || hleafname == "__description" || hleafname == "__inverse" ||
-			hleafname == "__class")
-			continue;
-		std::u32string hleafc = i->as_string();
-		if(!first)
-			imp << "\t\"\\n\"" << std::endl;
-		first = false;
-		imp << "\t" << quote_c_string(std::string("Syntax: ") + cmdname + " " + hleafname + "\n")
-			<< std::endl;
-		imp << quote_help(hleafc);
+	if(n.index_count() >= 3) {
+		auto& nc = n.index(2);
+		for(auto i = nc.begin(); i != nc.end(); i++) {
+			std::string hleafname = i.key8();
+			std::u32string hleafc = i->as_string();
+			if(!first)
+				imp << "\t\"\\n\"" << std::endl;
+			first = false;
+			imp << "\t" << quote_c_string(std::string("Syntax: ") + name + " " + hleafname + "\n")
+				<< std::endl;
+			imp << quote_help(hleafc);
+		}
 	}
-	if(first) imp << "\t\"No help available for '" << cmdname << "'\"" << std::endl;
+	if(first) imp << "\t\"No help available for '" << name << "'\"" << std::endl;
 	imp << "};" << std::endl;
 	imp << std::endl;
 }
@@ -127,14 +129,16 @@ int main(int argc, char** argv)
 	}
 	JSON::node n(in_json);
 
+	std::string modname = n["__mod"].as_string8();
+
 	std::ofstream hdr(fname + std::string(".hpp"));
 	std::ofstream impl(fname + std::string(".cpp"));
 	impl << "#include \"cmdhelp/" << fname << ".hpp\"" << std::endl;
-	impl << "namespace STUBS" << std::endl;
+	impl << "namespace " << modname << std::endl;
 	impl << "{" << std::endl;
 	hdr << "#pragma once" << std::endl;
 	hdr << "#include \"library/command.hpp\"" << std::endl;
-	hdr << "namespace STUBS" << std::endl;
+	hdr << "namespace " << modname << std::endl;
 	hdr << "{" << std::endl;
 	for(auto i = n.begin(); i != n.end(); i++)
 		process_command(i.key8(), *i, hdr, impl);
diff --git a/src/cmdhelp/mkstubsi.cpp b/src/cmdhelp/mkstubsi.cpp
index 6f16f326..6c7c6846 100644
--- a/src/cmdhelp/mkstubsi.cpp
+++ b/src/cmdhelp/mkstubsi.cpp
@@ -7,9 +7,7 @@
 
 const char* hexes = "0123456789abcdef";
 
-std::string quote_c_string(const std::string& raw, bool hiraw = false);
-
-std::string quote_c_string(const std::string& raw, bool hiraw)
+std::string quote_c_string(const std::string& raw)
 {
 	std::ostringstream out;
 	out << "\"";
@@ -21,7 +19,7 @@ std::string quote_c_string(const std::string& raw, bool hiraw)
 			out << "\\\"";
 		else if(ch == '\\')
 			out << "\\\\";
-		else if(ch < 32 || ch == 127 || (ch > 127 && !hiraw))
+		else if(ch < 32 || ch == 127)
 			out << "\\x" << hexes[ch / 16] << hexes[ch % 16];
 		else
 			out << ch;
@@ -30,20 +28,19 @@ std::string quote_c_string(const std::string& raw, bool hiraw)
 	return out.str();
 }
 
-void process_command_inverse(JSON::node& n, std::ostream& imp)
+void process_command_inverse(JSON::node& n, std::string name, std::ostream& imp)
 {
-	if(!n.field_exists("__inverse"))
+	if(name == "__mod" || !n.index_count() < 4)
 		return;
-	auto& inv = n["__inverse"];
-	auto name = n["__name"].as_string8();
+	auto& inv = n.index(3);
 	for(auto i = inv.begin(); i != inv.end(); i++) {
 		std::string args = i.key8();
 		std::string desc = i->as_string8();
 		if(args != "")
-			imp << "\t" << quote_c_string(name + " " + args) << ", " << quote_c_string(desc, true) << ","
+			imp << "\t" << quote_c_string(name + " " + args) << ", " << quote_c_string(desc) << ","
 				<< std::endl;
 		else
-			imp << "\t" << quote_c_string(name) << ", " << quote_c_string(desc, true) << "," << std::endl;
+			imp << "\t" << quote_c_string(name) << ", " << quote_c_string(desc) << "," << std::endl;
 	}
 }
 
@@ -68,7 +65,7 @@ int main(int argc, char** argv)
 		}
 		JSON::node n(in_json);
 		for(auto j = n.begin(); j != n.end(); j++)
-			process_command_inverse(*j, impl);
+			process_command_inverse(*j, j.key8(), impl);
 	}
 
 	impl << "\t0\n};" << std::endl;
diff --git a/src/cmdhelp/moviedata.json b/src/cmdhelp/moviedata.json
new file mode 100644
index 00000000..ffe49740
--- /dev/null
+++ b/src/cmdhelp/moviedata.json
@@ -0,0 +1,11 @@
+{
+	"__mod":"CMOVIEDATA",
+	"panicsave-movie":[
+		"panic", "Trigger panic movie save",
+		{"":"Panicdumps movie to file like if emulator segfaulted"}
+	],
+	"dump-coresave":[
+		"dumpcore", "Dump core state",
+		{"<name>":"Dumps core save to file <name>"}
+	]
+}
diff --git a/src/cmdhelp/multitrack.json b/src/cmdhelp/multitrack.json
dissimilarity index 99%
index d0849108..415afc34 100644
--- a/src/cmdhelp/multitrack.json
+++ b/src/cmdhelp/multitrack.json
@@ -1,19 +1,17 @@
-{
-	"multitrackf":{
-		"__name":"rotate-multitrack",
-		"__description":"Rotate multitrack",
-		"":"Rotate multitrack state",
-		"__inverse":{"":"Multitrack‣Rotate forward"}
-	},
-	"multitrackb":{
-		"__name":"rotate-multitrack-backwards",
-		"__description":"Rotate multitrack backwards",
-		"":"Rotate multitrack state backwards",
-		"__inverse":{"":"Multitrack‣Rotate backwards"}
-	},
-	"multitracks":{
-		"__name":"set-multitrack",
-		"__description":"Set multitrack mode",
-		"<controller> <mode>":"Set multitrack mode for <controller> to <mode>"
-	}
-}
+{
+	"__mod":"CMULTITRACK",
+	"rotate-multitrack":[
+		"f", "Rotate multitrack",
+		{"":"Rotate multitrack state"},
+		{"":"Multitrack‣Rotate forward"}
+	],
+	"rotate-multitrack-backwards":[
+		"b", "Rotate multitrack backwards",
+		{"":"Rotate multitrack state backwards"},
+		{"":"Multitrack‣Rotate backwards"}
+	],
+	"set-multitrack":[
+		"s", "Set multitrack mode",
+		{"<controller> <mode>":"Set multitrack mode for <controller> to <mode>"}
+	]
+}
diff --git a/src/cmdhelp/project.json b/src/cmdhelp/project.json
dissimilarity index 99%
index 6dd8846a..9566c414 100644
--- a/src/cmdhelp/project.json
+++ b/src/cmdhelp/project.json
@@ -1,38 +1,27 @@
-{
-	"branch_ls":{
-		"__class":"project",
-		"__name":"list-branches",
-		"__description":"List all slot branches",
-		"":"List all slot branches."
-	},
-	"branch_mk":{
-		"__class":"project",
-		"__name":"create-branch",
-		"__description":"Create a new slot branch",
-		"<parentid> <name>":"Create new branch named <name> under <parentid>."
-	},
-	"branch_rm":{
-		"__class":"project",
-		"__name":"delete-branch",
-		"__description":"Delete a slot branch",
-		"<id>":"Delete slot branch with id <id>."
-	},
-	"branch_set":{
-		"__class":"project",
-		"__name":"set-branch",
-		"__description":"Set current slot branch",
-		"<id>":"Set current branch to <id>."
-	},
-	"branch_rp":{
-		"__class":"project",
-		"__name":"reparent-branch",
-		"__description":"Reparent a slot branch",
-		"<id> <newpid>":"Reparent branch <id> to be child of <newpid>."
-	},
-	"branch_mv":{
-		"__class":"project",
-		"__name":"rename-branch",
-		"__description":"Rename a slot branch",
-		"<id> <name>":"Rename branch <id> to <name>."
-	}
-}
+{
+	"__mod":"CPROJECT",
+	"list-branches":[
+		"bls", "List all slot branches",
+		{"":"List all slot branches."}
+	],
+	"create-branch":[
+		"bmk", "Create a new slot branch",
+		{"<parentid> <name>":"Create new branch named <name> under <parentid>."}
+	],
+	"delete-branch":[
+		"brm", "Delete a slot branch",
+		{"<id>":"Delete slot branch with id <id>."}
+	],
+	"set-branch":[
+		"bset", "Set current slot branch",
+		{"<id>":"Set current branch to <id>."}
+	],
+	"reparent-branch":[
+		"brp", "Reparent a slot branch",
+		{"<id> <newpid>":"Reparent branch <id> to be child of <newpid>."}
+	],
+	"rename-branch":[
+		"bmv", "Rename a slot branch",
+		{"<id> <name>":"Rename branch <id> to <name>."}
+	]
+}
diff --git a/src/cmdhelp/sound.json b/src/cmdhelp/sound.json
new file mode 100644
index 00000000..f3c7d80d
--- /dev/null
+++ b/src/cmdhelp/sound.json
@@ -0,0 +1,36 @@
+{
+	"__mod":"CSOUND",
+	"show-plugins":[
+		"showdrv", "Show plugins in use",
+		{"":"Shows plugins in use."}
+	],
+	"enable-sound":[
+		"enable", "Enable/Disable sound",
+		{
+			"on":"Enable sound",
+			"off":"Disable sound (does not affect dumping)",
+			"toggle":"Toggle sound (does not affect dumping)"
+		},
+		{
+			"on":"Sound‣Enable",
+			"off":"Sound‣Disable",
+			"toggle":"Sound‣Toggle"
+		}
+	],
+	"change-playback-device":[
+		"chpdev", "Change sound playback device",
+		{"<device>":"Switch to playback device <device>."}
+	],
+	"change-record-device":[
+		"chrdev", "Change sound record device",
+		{"<device>":"Switch to recording device <device>."}
+	],
+	"show-devices":[
+		"showdev", "Show sound devices available",
+		{"":"Shows available sound devices."}
+	],
+	"reset-audio":[
+		"reset", "Reset audio driver",
+		{"":"Resets the audio driver."}
+	]
+}
diff --git a/src/cmdhelp/subtitles.json b/src/cmdhelp/subtitles.json
dissimilarity index 99%
index ec478d7b..642372d3 100644
--- a/src/cmdhelp/subtitles.json
+++ b/src/cmdhelp/subtitles.json
@@ -1,18 +1,18 @@
-{
-	"editsub":{
-		"__name":"edit-subtitle",
-		"__description":"Edit a subtitle",
-		"<first> <length> <text>":"Add/Edit subtitle",
-		"<first> <length>":"Delete subtitle"
-	},
-	"listsub":{
-		"__name":"list-subtitle",
-		"__description":"List the subtitles",
-		"":"List the subtitles."
-	},
-	"savesub":{
-		"__name":"save-subtitle",
-		"__description":"Save subtitles in .sub format",
-		"<file>":"Saves subtitles in .sub format to <file>"
-	}
-}
+{
+	"__mod":"CSUBTITLE",
+	"edit-subtitle":[
+		"edit", "Edit a subtitle",
+		{
+			"<first> <length> <text>":"Add/Edit subtitle",
+			"<first> <length>":"Delete subtitle"
+		}
+	],
+	"list-subtitle":[
+		"list", "List the subtitles",
+		{"":"List the subtitles."}
+	],
+	"save-subtitle":[
+		"save", "Save subtitles in .sub format",
+		{"<file>":"Saves subtitles in .sub format to <file>"}
+	]
+}
diff --git a/src/cmdhelp/turbo.json b/src/cmdhelp/turbo.json
dissimilarity index 99%
index 53a3fd51..ccee48b4 100644
--- a/src/cmdhelp/turbo.json
+++ b/src/cmdhelp/turbo.json
@@ -1,22 +1,17 @@
-{
-	"turbot":{
-		"__class":"turbo",
-		"__name":"toggle-turbo",
-		"__description":"Toggle turbo",
-		"":"Toggle turbo mode.",
-		"__inverse":{"":"Speed‣Turbo toggle"}
-	},
-	"turbop":{
-		"__class":"turbo",
-		"__name":"+turbo",
-		"__description":"Activate turbo",
-		"":"Activate turbo mode.",
-		"__inverse":{"":"Speed‣Turbo hold"}
-	},
-	"turbor":{
-		"__class":"turbo",
-		"__name":"-turbo",
-		"__description":"Deactivate turbo",
-		"":"Deactivate turbo mode."
-	}
-}
+{
+	"__mod":"CTURBO",
+	"toggle-turbo":[
+		"t", "Toggle turbo",
+		{"":"Toggle turbo mode."},
+		{"":"Speed‣Turbo toggle"}
+	],
+	"+turbo":[
+		"p", "Activate turbo",
+		{"":"Activate turbo mode."},
+		{"":"Speed‣Turbo hold"}
+	],
+	"-turbo":[
+		"r", "Deactivate turbo",
+		{"":"Deactivate turbo mode."}
+	]
+}
diff --git a/src/core/actions.cpp b/src/core/actions.cpp
index 27b35b98..ba9ca971 100644
--- a/src/core/actions.cpp
+++ b/src/core/actions.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/action.hpp"
 #include "core/command.hpp"
 #include "core/instance.hpp"
 #include "core/messages.hpp"
@@ -6,8 +7,7 @@
 
 namespace
 {
-	command::fnptr<const std::string&> CMD_action(lsnes_cmds, "action", "Execute core action",
-		"Syntax: action <name> [<params>...]\nExecutes core action.\n",
+	command::fnptr<const std::string&> CMD_action(lsnes_cmds, CACTION::e,
 		[](const std::string& _args) throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			if(_args == "") {
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index d604cc37..c4f89336 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -35,15 +35,15 @@ button_mapping::button_mapping(controller_state& _controls, keyboard::mapper& _m
 	emu_framebuffer& _fbuf, emulator_dispatch& _dispatch, lua_state& _lua2, command::group& _cmd)
 	: controls(_controls), mapper(_mapper), keyboard(_keyboard), fbuf(_fbuf), edispatch(_dispatch),
 	lua2(_lua2), cmd(_cmd),
-	button_p(cmd, STUBS::btnp, [this](const std::string& a) { this->do_action(a, 1, 0); }), 
-	button_r(cmd, STUBS::btnr, [this](const std::string& a) { this->do_action(a, 0, 0); }),
-	button_h(cmd, STUBS::btnh, [this](const std::string& a) { this->do_action(a, 1, 1); }), 
-	button_t(cmd, STUBS::btnt, [this](const std::string& a) { this->do_action(a, 1, 2); }),
-	button_d(cmd, STUBS::btnd, [this](const std::string& a) { this->do_action(a, 0, 3); }),
-	button_ap(cmd, STUBS::btnap, [this](const std::string& a) { this->do_autofire_action(a, 1); }),
-	button_ar(cmd, STUBS::btnar, [this](const std::string& a) { this->do_autofire_action(a, 0); }),
-	button_at(cmd, STUBS::btnat, [this](const std::string& a) { this->do_autofire_action(a, -1); }),
-	button_a(cmd, STUBS::btna, [this](const std::string& a) { this->do_analog_action(a); })
+	button_p(cmd, CBUTTON::p, [this](const std::string& a) { this->do_action(a, 1, 0); }), 
+	button_r(cmd, CBUTTON::r, [this](const std::string& a) { this->do_action(a, 0, 0); }),
+	button_h(cmd, CBUTTON::h, [this](const std::string& a) { this->do_action(a, 1, 1); }), 
+	button_t(cmd, CBUTTON::t, [this](const std::string& a) { this->do_action(a, 1, 2); }),
+	button_d(cmd, CBUTTON::d, [this](const std::string& a) { this->do_action(a, 0, 3); }),
+	button_ap(cmd, CBUTTON::ap, [this](const std::string& a) { this->do_autofire_action(a, 1); }),
+	button_ar(cmd, CBUTTON::ar, [this](const std::string& a) { this->do_autofire_action(a, 0); }),
+	button_at(cmd, CBUTTON::at, [this](const std::string& a) { this->do_autofire_action(a, -1); }),
+	button_a(cmd, CBUTTON::a, [this](const std::string& a) { this->do_analog_action(a); })
 {
 	ncore.set(notify_new_core, [this]() { this->init(); });
 }
@@ -109,9 +109,9 @@ void button_mapping::load(controller_state& ctrlstate)
 	for(auto i : s) {
 		if(!macro_binds.count(i)) {
 			//New macro, create inverse bind.
-			macro_binds[i] = new keyboard::invbind(mapper, STUBS::macrot.name + (" " + i) , "Macro‣" + i +
+			macro_binds[i] = new keyboard::invbind(mapper, CMACRO::t.name + (" " + i) , "Macro‣" + i +
 				" (toggle)");
-			macro_binds2[i] = new keyboard::invbind(mapper, STUBS::macrop.name + (" " + i) , "Macro‣" +
+			macro_binds2[i] = new keyboard::invbind(mapper, CMACRO::p.name + (" " + i) , "Macro‣" +
 				i + " (hold)");
 		}
 	}
@@ -184,33 +184,33 @@ void button_mapping::add_button(const std::string& name, const button_mapping::c
 {
 	keyboard::ctrlrkey* k;
 	if(binding.mode == 0) {
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnp.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::p.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name).str());
 		promote_key(*k);
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnh.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::h.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name << "‣hold").str());
 		promote_key(*k);
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnt.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::t.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name << "‣type").str());
 		promote_key(*k);
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnap.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::ap.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name << "‣autofire").str());
 		promote_key(*k);
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnat.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::at.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name << "‣autofire toggle").str());
 		promote_key(*k);
 	} else if(binding.mode == 1) {
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btnd.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::d.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name).str());
 		promote_key(*k);
 	} else if(binding.mode == 2) {
-		k = new keyboard::ctrlrkey(mapper, (stringfmt() << STUBS::btna.name << " "
+		k = new keyboard::ctrlrkey(mapper, (stringfmt() << CBUTTON::a.name << " "
 			<< name).str(), (stringfmt() << "Controller‣" << binding.cclass << "‣#"
 			<< binding.number << "‣" << binding.name << " (axis)").str(), true);
 		promote_key(*k);
diff --git a/src/core/controllerframe.cpp b/src/core/controllerframe.cpp
index e896ca1c..0b9c9200 100644
--- a/src/core/controllerframe.cpp
+++ b/src/core/controllerframe.cpp
@@ -1,7 +1,9 @@
 #include "cmdhelp/macro.hpp"
+#include "core/command.hpp"
 #include "core/controllerframe.hpp"
 #include "core/controller.hpp"
 #include "core/dispatch.hpp"
+#include "core/instance.hpp"
 #include "core/messages.hpp"
 #include "core/moviedata.hpp"
 #include "core/project.hpp"
@@ -13,15 +15,46 @@
 namespace
 {
 	portctrl::type_set dummytypes;
+
+	command::fnptr<const std::string&> macro_test(lsnes_cmds, CMACRO::test,
+		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
+			auto& core = CORE();
+			regex_results r = regex("([0-9]+)[ \t](.*)", args);
+			if(!r) {
+				messages << "Bad syntax" << std::endl;
+				return;
+			}
+			unsigned ctrl = parse_value<unsigned>(r[1]);
+			auto pcid = core.controls->lcid_to_pcid(ctrl);
+			if(pcid.first < 0) {
+				messages << "Bad controller" << std::endl;
+				return;
+			}
+			try {
+				const portctrl::controller* _ctrl = 
+					core.controls->get_blank().porttypes().port_type(pcid.first).
+					controller_info->get(pcid.second);
+				if(!_ctrl) {
+					messages << "No controller data for controller" << std::endl;
+					return;
+				}
+				portctrl::macro_data mdata(r[2].c_str(),
+					portctrl::macro_data::make_descriptor(*_ctrl), 0);
+				messages << "Macro: " << mdata.dump(*_ctrl) << std::endl;
+			} catch(std::exception& e) {
+				messages << "Exception: " << e.what() << std::endl;
+			}
+		});
+
 }
 
 controller_state::controller_state(project_state& _project, movie_logic& _mlogic, button_mapping& _buttons,
 	emulator_dispatch& _dispatch, status_updater& _supdater, command::group& _cmd) throw()
 	: project(_project), mlogic(_mlogic), buttons(_buttons), edispatch(_dispatch), supdater(_supdater),
 	cmd(_cmd),
-	macro_p(cmd, STUBS::macrop, [this](const std::string& a) { this->do_macro(a, 5); }),
-	macro_r(cmd, STUBS::macror, [this](const std::string& a) { this->do_macro(a, 2); }),
-	macro_t(cmd, STUBS::macrot, [this](const std::string& a) { this->do_macro(a, 7); })
+	macro_p(cmd, CMACRO::p, [this](const std::string& a) { this->do_macro(a, 5); }),
+	macro_r(cmd, CMACRO::r, [this](const std::string& a) { this->do_macro(a, 2); }),
+	macro_t(cmd, CMACRO::t, [this](const std::string& a) { this->do_macro(a, 7); })
 {
 	types = &dummytypes;
 	tasinput_enaged = false;
diff --git a/src/core/debug.cpp b/src/core/debug.cpp
index 8b82e229..f570f1c9 100644
--- a/src/core/debug.cpp
+++ b/src/core/debug.cpp
@@ -53,9 +53,9 @@ namespace
 debug_context::debug_context(emulator_dispatch& _dispatch, loaded_rom& _rom, memory_space& _mspace,
 	command::group& _cmd)
 	: edispatch(_dispatch), rom(_rom), mspace(_mspace), cmd(_cmd),
-	showhooks(cmd, STUBS::showhooks, [this]() { this->do_showhooks(); }),
-	genevent(cmd, STUBS::genevent, [this](const std::string& a) { this->do_genevent(a); }),
-	tracecmd(cmd, STUBS::trace, [this](const std::string& a) { this->do_tracecmd(a); })
+	showhooks(cmd, CDEBUG::scb, [this]() { this->do_showhooks(); }),
+	genevent(cmd, CDEBUG::genevt, [this](const std::string& a) { this->do_genevent(a); }),
+	tracecmd(cmd, CDEBUG::tr, [this](const std::string& a) { this->do_tracecmd(a); })
 {
 }
 
diff --git a/src/core/disassemble.cpp b/src/core/disassemble.cpp
index 469c93bb..6b9c738c 100644
--- a/src/core/disassemble.cpp
+++ b/src/core/disassemble.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/disassemble.hpp"
 #include "core/command.hpp"
 #include "core/instance.hpp"
 #include "core/memorymanip.hpp"
@@ -21,8 +22,7 @@ namespace
 		std::string disasm;
 	};
 
-	command::fnptr<const std::string&> CMD_disassemble(lsnes_cmds, "disassemble", "Disassemble code",
-		"Syntax: disassemble <kind> <addr> [<count>] [to <filename>]\nDisassemble code\n",
+	command::fnptr<const std::string&> CMD_disassemble(lsnes_cmds, CDISASM::d,
 		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
 		auto& core = CORE();
 		regex_results r = regex("([^ \t]+)[ \t]+([0-9]+|0x[0-9A-Fa-f]+)([ \t]+([0-9]+))?"
diff --git a/src/core/emustatus.cpp b/src/core/emustatus.cpp
index 04d651bd..3ee8dc4e 100644
--- a/src/core/emustatus.cpp
+++ b/src/core/emustatus.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/loadsave.hpp"
 #include "core/advdumper.hpp"
 #include "core/audioapi.hpp"
 #include "core/dispatch.hpp"
@@ -23,8 +24,9 @@ const int _lsnes_status::pause_break = 2;
 const uint64_t _lsnes_status::subframe_savepoint = 0xFFFFFFFFFFFFFFFEULL;
 const uint64_t _lsnes_status::subframe_video = 0xFFFFFFFFFFFFFFFFULL;
 
-slotinfo_cache::slotinfo_cache(movie_logic& _mlogic)
-	: mlogic(_mlogic)
+slotinfo_cache::slotinfo_cache(movie_logic& _mlogic, command::group& _cmd)
+	: mlogic(_mlogic), cmd(_cmd),
+	flushcmd(cmd, CLOADSAVE::flushslots, [this]() { this->flush(); })
 {
 }
 
diff --git a/src/core/framebuffer.cpp b/src/core/framebuffer.cpp
index d753d7a1..92cc98a6 100644
--- a/src/core/framebuffer.cpp
+++ b/src/core/framebuffer.cpp
@@ -95,7 +95,7 @@ emu_framebuffer::emu_framebuffer(subtitle_commentary& _subtitles, settingvar::gr
 	status_updater& _supdater, command::group& _cmd)
 	: buffering(buffer1, buffer2, buffer3), subtitles(_subtitles), settings(_settings), mwatch(_mwatch),
 	keyboard(_keyboard), edispatch(_dispatch), lua2(_lua2), rom(_rom), supdater(_supdater), cmd(_cmd),
-	screenshot(cmd, STUBS::screenshot, [this](command::arg_filename a) { this->do_screenshot(a); })
+	screenshot(cmd, CFRAMEBUF::ss, [this](command::arg_filename a) { this->do_screenshot(a); })
 {
 	last_redraw_no_lua = false;
 }
diff --git a/src/core/framerate.cpp b/src/core/framerate.cpp
index 31f122d1..7a5438a7 100644
--- a/src/core/framerate.cpp
+++ b/src/core/framerate.cpp
@@ -19,9 +19,9 @@ bool graphics_driver_is_dummy();
 
 framerate_regulator::framerate_regulator(command::group& _cmd)
 	: cmd(_cmd),
-	turbo_p(cmd, STUBS::turbop, [this]() { this->turboed = true; }),
-	turbo_r(cmd, STUBS::turbor, [this]() { this->turboed = false; }),
-	turbo_t(cmd, STUBS::turbot, [this]() { this->turboed = !this->turboed; })
+	turbo_p(cmd, CTURBO::p, [this]() { this->turboed = true; }),
+	turbo_r(cmd, CTURBO::r, [this]() { this->turboed = false; }),
+	turbo_t(cmd, CTURBO::t, [this]() { this->turboed = !this->turboed; })
 {
 	last_time_update = 0;
 	time_at_last_update = 0;
diff --git a/src/core/instance.cpp b/src/core/instance.cpp
index 48e6c91f..9777955d 100644
--- a/src/core/instance.cpp
+++ b/src/core/instance.cpp
@@ -79,7 +79,7 @@ emulator_instance::emulator_instance()
 	D.init(command);
 	D.init(iqueue, *command);
 	D.init(mlogic);
-	D.init(slotcache, *mlogic);
+	D.init(slotcache, *mlogic, *command);
 	D.init(memory);
 	D.init(lua);
 	D.init(lua2, *lua, *command);
diff --git a/src/core/inthread.cpp b/src/core/inthread.cpp
index 0d0b27d4..b910aeb8 100644
--- a/src/core/inthread.cpp
+++ b/src/core/inthread.cpp
@@ -1721,8 +1721,8 @@ out:
 voice_commentary::voice_commentary(settingvar::group& _settings, emulator_dispatch& _dispatch,
 	audioapi_instance& _audio, command::group& _cmd)
 	: settings(_settings), edispatch(_dispatch), audio(_audio), cmd(_cmd),
-	tangentp(cmd, STUBS::tangentp, [this]() { this->set_active_flag(true); }),
-	tangentr(cmd, STUBS::tangentr, [this]() { this->set_active_flag(false); })
+	tangentp(cmd, CCOMMENTARY::p, [this]() { this->set_active_flag(true); }),
+	tangentr(cmd, CCOMMENTARY::r, [this]() { this->set_active_flag(false); })
 {
 	internal = NULL;
 }
diff --git a/src/core/jukebox.cpp b/src/core/jukebox.cpp
index 9cd31187..03fb56ae 100644
--- a/src/core/jukebox.cpp
+++ b/src/core/jukebox.cpp
@@ -33,9 +33,9 @@ private:
 
 save_jukebox::save_jukebox(settingvar::group& _settings, command::group& _cmd)
 	: settings(_settings), cmd(_cmd),
-	slotsel(cmd, STUBS::slotselect, [this](const std::string& a) { this->do_slotsel(a); }),
-	cycleprev(cmd, STUBS::slotprev, [this]() { this->cycle_prev(); }),
-	cyclenext(cmd, STUBS::slotnext, [this]() { this->cycle_next(); })
+	slotsel(cmd, CJUKEBOX::sel, [this](const std::string& a) { this->do_slotsel(a); }),
+	cycleprev(cmd, CJUKEBOX::prev, [this]() { this->cycle_prev(); }),
+	cyclenext(cmd, CJUKEBOX::next, [this]() { this->cycle_next(); })
 {
 	listener = new save_jukebox_listener(_settings, *this);
 }
diff --git a/src/core/keymapper.cpp b/src/core/keymapper.cpp
index 36b92cee..7e6c8b6a 100644
--- a/src/core/keymapper.cpp
+++ b/src/core/keymapper.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/keymapper.hpp"
 #include "core/command.hpp"
 #include "core/instance.hpp"
 #include "core/joystickapi.hpp"
@@ -98,16 +99,14 @@ void cleanup_keymapper()
 
 namespace
 {
-	command::fnptr<> CMD_show_joysticks(lsnes_cmds, "show-joysticks", "Show joystick info",
-		"Syntax: show-joysticks\nShow joystick info.\n",
+	command::fnptr<> CMD_show_joysticks(lsnes_cmds, CKEYMAPPER::show,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			messages << "--------------------------------------------" << std::endl;
 			messages << lsnes_gamepads.get_summary() << std::endl;
 			messages << "--------------------------------------------" << std::endl;
 		});
 
-	command::fnptr<> reset_joysticks(lsnes_cmds, "reset-gamepads", "Reset gamepads",
-		"Syntax: reset-gamepads\nResets gamepads.\n",
+	command::fnptr<> reset_joysticks(lsnes_cmds, CKEYMAPPER::reset,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			joystick_driver_quit();
 			lsnes_gamepads.offline_all(); //Not supposed to have online gamepads.
diff --git a/src/core/loadlib.cpp b/src/core/loadlib.cpp
index ad7ebf5a..1f30d331 100644
--- a/src/core/loadlib.cpp
+++ b/src/core/loadlib.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/loadlib.hpp"
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
 #include "core/loadlib.hpp"
@@ -157,7 +158,13 @@ namespace
 		}
 	}
 
-	command::fnptr<const std::string&> CMD_unload_library(lsnes_cmds, "unload-library", "", "",
+	command::fnptr<command::arg_filename> CMD_load_library(lsnes_cmds, CLOADLIB::load,
+		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
+			with_loaded_library(*new loadlib::module(loadlib::library(args)));
+			handle_post_loadlibrary();
+		});
+
+	command::fnptr<const std::string&> CMD_unload_library(lsnes_cmds, CLOADLIB::unload,
 		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
 			unsigned libid = parse_value<unsigned>(args);
 			if(!modules.count(libid))
@@ -166,7 +173,7 @@ namespace
 			modules.erase(libid);
 		});
 
-	command::fnptr<> CMD_list_library(lsnes_cmds, "list-libraries", "", "",
+	command::fnptr<> CMD_list_library(lsnes_cmds, CLOADLIB::list,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			for(auto i : modules)
 				messages << "#" << i.first << " [" << i.second->get_libname() << "]" << std::endl;
diff --git a/src/core/mainloop.cpp b/src/core/mainloop.cpp
index cf3dabf4..04494aa2 100644
--- a/src/core/mainloop.cpp
+++ b/src/core/mainloop.cpp
@@ -381,43 +381,37 @@ namespace
 			}
 		});
 
-	command::fnptr<> CMD_load_jukebox(lsnes_cmds, "load-jukebox", "Load save from jukebox",
-		"Syntax: load-jukebox\nLoad save from jukebox\n",
+	command::fnptr<> CMD_load_jukebox(lsnes_cmds, CLOADSAVE::ldj,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_load(core.jukebox->get_slot_name(), LOAD_STATE_CURRENT);
 		});
 
-	command::fnptr<> CMD_load_jukebox_readwrite(lsnes_cmds, "load-jukebox-readwrite", "Load save from jukebox in"
-		" recording mode", "Syntax: load-jukebox-readwrite\nLoad save from jukebox in recording mode\n",
+	command::fnptr<> CMD_load_jukebox_readwrite(lsnes_cmds, CLOADSAVE::ldjrw,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_load(core.jukebox->get_slot_name(), LOAD_STATE_RW);
 		});
 
-	command::fnptr<> CMD_load_jukebox_readonly(lsnes_cmds, "load-jukebox-readonly", "Load save from jukebox in "
-		"playback mode", "Syntax: load-jukebox-readonly\nLoad save from jukebox in playback mode\n",
+	command::fnptr<> CMD_load_jukebox_readonly(lsnes_cmds, CLOADSAVE::ldjro,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_load(core.jukebox->get_slot_name(), LOAD_STATE_RO);
 		});
 
-	command::fnptr<> CMD_load_jukebox_preserve(lsnes_cmds, "load-jukebox-preserve", "Load save from jukebox, "
-		"preserving input", "Syntax: load-jukebox-preserve\nLoad save from jukebox, preserving input\n",
+	command::fnptr<> CMD_load_jukebox_preserve(lsnes_cmds, CLOADSAVE::ldjp,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_load(core.jukebox->get_slot_name(), LOAD_STATE_PRESERVE);
 		});
 
-	command::fnptr<> CMD_load_jukebox_movie(lsnes_cmds, "load-jukebox-movie", "Load save from jukebox as movie",
-		"Syntax: load-jukebox-movie\nLoad save from jukebox as movie\n",
+	command::fnptr<> CMD_load_jukebox_movie(lsnes_cmds, CLOADSAVE::ldjm,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_load(core.jukebox->get_slot_name(), LOAD_STATE_MOVIE);
 		});
 
-	command::fnptr<> CMD_save_jukebox_c(lsnes_cmds, "save-jukebox", "Save save to jukebox",
-		"Syntax: save-jukebox\nSave save to jukebox\n",
+	command::fnptr<> CMD_save_jukebox_c(lsnes_cmds, CLOADSAVE::saj,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			mark_pending_save(core.jukebox->get_slot_name(), SAVE_STATE, -1);
@@ -497,81 +491,67 @@ namespace
 			core.rom->execute_action(hreset_action, std::vector<interface_action_paramval>());
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_c(lsnes_cmds, STUBS::load,
+	command::fnptr<command::arg_filename> CMD_load_c(lsnes_cmds, CLOADSAVE::ld,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_CURRENT);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_smart_c(lsnes_cmds, "load-smart",
-		"Load savestate (heuristic mode)",
-		"Syntax: load <file>\nLoads SNES state from <file> in heuristic mode\n",
+	command::fnptr<command::arg_filename> CMD_load_smart_c(lsnes_cmds, CLOADSAVE::ldsm,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_DEFAULT);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_state_c(lsnes_cmds, "load-state", "Load savestate (R/W)",
-		"Syntax: load-state <file>\nLoads SNES state from <file> in Read/Write mode\n",
+	command::fnptr<command::arg_filename> CMD_load_state_c(lsnes_cmds, CLOADSAVE::ldrw,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_RW);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_readonly(lsnes_cmds, "load-readonly", "Load savestate (RO)",
-		"Syntax: load-readonly <file>\nLoads SNES state from <file> in playback mode\n",
+	command::fnptr<command::arg_filename> CMD_load_readonly(lsnes_cmds, CLOADSAVE::ldro,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_RO);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_preserve(lsnes_cmds, "load-preserve",
-		"Load savestate (preserve input)",
-		"Syntax: load-preserve <file>\nLoads SNES state from <file> preserving input\n",
+	command::fnptr<command::arg_filename> CMD_load_preserve(lsnes_cmds, CLOADSAVE::ldp,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_PRESERVE);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_movie_c(lsnes_cmds, "load-movie", "Load movie",
-		"Syntax: load-movie <file>\nLoads SNES movie from <file>\n",
+	command::fnptr<command::arg_filename> CMD_load_movie_c(lsnes_cmds, CLOADSAVE::ldm,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_MOVIE);
 		});
 
-	command::fnptr<command::arg_filename> CMD_load_allbr_c(lsnes_cmds, "load-allbranches", "Load savestate "
-		"(all branches)", "Syntax: load-allbranches <file>\nLoads SNES state from <file> with all "
-		"branches\n",
+	command::fnptr<command::arg_filename> CMD_load_allbr_c(lsnes_cmds, CLOADSAVE::ldab,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load(args, LOAD_STATE_ALLBRANCH);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_state(lsnes_cmds, STUBS::savestate,
+	command::fnptr<command::arg_filename> CMD_save_state(lsnes_cmds, CLOADSAVE::sa,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_STATE, -1);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_state2(lsnes_cmds, "save-state-binary", "Save state (binary)",
-		"Syntax: save-state-binary <file>\nSaves binary state to <file>\n",
+	command::fnptr<command::arg_filename> CMD_save_state2(lsnes_cmds, CLOADSAVE::sasb,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_STATE, 1);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_state3(lsnes_cmds, "save-state-zip", "Save state (zip)",
-		"Syntax: save-state-zip <file>\nSaves zip state to <file>\n",
+	command::fnptr<command::arg_filename> CMD_save_state3(lsnes_cmds, CLOADSAVE::sasz,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_STATE, 0);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_movie(lsnes_cmds, "save-movie", "Save movie",
-		"Syntax: save-movie <file>\nSaves SNES movie to <file>\n",
+	command::fnptr<command::arg_filename> CMD_save_movie(lsnes_cmds, CLOADSAVE::sam,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_MOVIE, -1);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_movie2(lsnes_cmds, "save-movie-binary", "Save movie (binary)",
-		"Syntax: save-movie-binary <file>\nSaves binary movie to <file>\n",
+	command::fnptr<command::arg_filename> CMD_save_movie2(lsnes_cmds, CLOADSAVE::samb,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_MOVIE, 1);
 		});
 
-	command::fnptr<command::arg_filename> CMD_save_movie3(lsnes_cmds, "save-movie-zip", "Save movie (zip)",
-		"Syntax: save-movie-zip <file>\nSaves zip movie to <file>\n",
+	command::fnptr<command::arg_filename> CMD_save_movie3(lsnes_cmds, CLOADSAVE::samz,
 		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_save(args, SAVE_MOVIE, 0);
 		});
@@ -636,34 +616,26 @@ namespace
 			messages << "Pause-on-end is now OFF" << std::endl;
 		});
 
-	command::fnptr<> CMD_rewind_movie(lsnes_cmds, "rewind-movie", "Rewind movie to the beginning",
-		"Syntax: rewind-movie\nRewind movie to the beginning\n",
+	command::fnptr<> CMD_rewind_movie(lsnes_cmds, CLOADSAVE::rewind,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			mark_pending_load("SOME NONBLANK NAME", LOAD_STATE_BEGINNING);
 		});
 
-	command::fnptr<> CMD_cancel_save(lsnes_cmds, "cancel-saves", "Cancel all pending saves", "Syntax: "
-		"cancel-save\nCancel pending saves\n",
+	command::fnptr<> CMD_cancel_save(lsnes_cmds, CLOADSAVE::cancel,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			queued_saves.clear();
 			messages << "Pending saves canceled." << std::endl;
 		});
 
-	command::fnptr<> CMD_flushslots(lsnes_cmds, "flush-slotinfo", "Flush slotinfo cache",
-		"Flush slotinfo cache\n",
-		[]() throw(std::bad_alloc, std::runtime_error) {
-			CORE().slotcache->flush();
-		});
-
-	command::fnptr<> CMD_mhold1(lsnes_cmds, STUBS::mholdp, []() throw(std::bad_alloc, std::runtime_error) {
+	command::fnptr<> CMD_mhold1(lsnes_cmds, CMHOLD::p, []() throw(std::bad_alloc, std::runtime_error) {
 		macro_hold_1 = true;
 	});
 
-	command::fnptr<> CMD_mhold2(lsnes_cmds, STUBS::mholdr, []() throw(std::bad_alloc, std::runtime_error) {
+	command::fnptr<> CMD_mhold2(lsnes_cmds, CMHOLD::r, []() throw(std::bad_alloc, std::runtime_error) {
 		macro_hold_1 = false;
 	});
 
-	command::fnptr<> CMD_mhold3(lsnes_cmds, STUBS::mholdt, []() throw(std::bad_alloc, std::runtime_error) {
+	command::fnptr<> CMD_mhold3(lsnes_cmds, CMHOLD::t, []() throw(std::bad_alloc, std::runtime_error) {
 		macro_hold_2 = !macro_hold_2;
 		if(macro_hold_2)
 			messages << "Macros are held for next frame." << std::endl;
@@ -672,15 +644,6 @@ namespace
 	});
 
 	keyboard::invbind_info IBIND_ipause_emulator(lsnes_invbinds, "pause-emulator", "Speed‣(Un)pause");
-	keyboard::invbind_info IBIND_iloadj(lsnes_invbinds, "load-jukebox", "Load‣Selected slot");
-	keyboard::invbind_info IBIND_iloadjrw(lsnes_invbinds, "load-jukebox-readwrite",
-		"Load‣Selected slot (recording mode)");
-	keyboard::invbind_info IBIND_iloadjro(lsnes_invbinds, "load-jukebox-readonly",
-		"Load‣Selected slot (playback mode)");
-	keyboard::invbind_info IBIND_iloadjp(lsnes_invbinds, "load-jukebox-preserve",
-		"Load‣Selected slot (preserve input)");
-	keyboard::invbind_info IBIND_iloadjm(lsnes_invbinds, "load-jukebox-movie", "Load‣Selected slot (as movie)");
-	keyboard::invbind_info IBIND_isavej(lsnes_invbinds, "save-jukebox", "Save‣Selected slot");
 	keyboard::invbind_info IBIND_iadvframe(lsnes_invbinds, "+advance-frame", "Speed‣Advance frame");
 	keyboard::invbind_info IBIND_iadvsubframe(lsnes_invbinds, "+advance-poll", "Speed‣Advance subframe");
 	keyboard::invbind_info IBIND_iskiplag(lsnes_invbinds, "advance-skiplag", "Speed‣Advance poll");
@@ -690,8 +653,6 @@ namespace
 	keyboard::invbind_info IBIND_itoggle_rwmode(lsnes_invbinds, "toggle-rwmode", "Movie‣Toggle playback");
 	keyboard::invbind_info IBIND_irepaint(lsnes_invbinds, "repaint", "System‣Repaint screen");
 	keyboard::invbind_info IBIND_itogglepause(lsnes_invbinds, "toggle-pause-on-end", "Movie‣Toggle pause-on-end");
-	keyboard::invbind_info IBIND_irewind_movie(lsnes_invbinds, "rewind-movie", "Movie‣Rewind movie");
-	keyboard::invbind_info IBIND_icancel_saves(lsnes_invbinds, "cancel-saves", "Save‣Cancel pending saves");
 
 	class mywindowcallbacks : public master_dumper::notifier
 	{
diff --git a/src/core/misc.cpp b/src/core/misc.cpp
index a2f396c2..2454edbe 100644
--- a/src/core/misc.cpp
+++ b/src/core/misc.cpp
@@ -59,12 +59,6 @@ namespace
 		exit(1);
 	}
 
-	command::fnptr<const std::string&> test4(lsnes_cmds, "panicsave-movie", "", "",
-		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
-		auto& core = CORE();
-		if(*core.mlogic) emerg_save_movie(core.mlogic->get_mfile(), core.mlogic->get_rrdata());
-	});
-
 	//% is intentionally missing.
 	const char* allowed_filename_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 		"^&'@{}[],$?!-#().+~_";
@@ -236,31 +230,3 @@ std::string get_temp_file()
 #endif
 }
 
-command::fnptr<const std::string&> macro_test(lsnes_cmds, "test-macro", "", "",
-	[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
-		auto& core = CORE();
-		regex_results r = regex("([0-9]+)[ \t](.*)", args);
-		if(!r) {
-			messages << "Bad syntax" << std::endl;
-			return;
-		}
-		unsigned ctrl = parse_value<unsigned>(r[1]);
-		auto pcid = core.controls->lcid_to_pcid(ctrl);
-		if(pcid.first < 0) {
-			messages << "Bad controller" << std::endl;
-			return;
-		}
-		try {
-			const portctrl::controller* _ctrl = 
-				core.controls->get_blank().porttypes().port_type(pcid.first).
-				controller_info->get(pcid.second);
-			if(!_ctrl) {
-				messages << "No controller data for controller" << std::endl;
-				return;
-			}
-			portctrl::macro_data mdata(r[2].c_str(), portctrl::macro_data::make_descriptor(*_ctrl), 0);
-			messages << "Macro: " << mdata.dump(*_ctrl) << std::endl;
-		} catch(std::exception& e) {
-			messages << "Exception: " << e.what() << std::endl;
-		}
-	});
diff --git a/src/core/moviedata.cpp b/src/core/moviedata.cpp
index c80e3701..b44f9fae 100644
--- a/src/core/moviedata.cpp
+++ b/src/core/moviedata.cpp
@@ -1,5 +1,6 @@
 #include "lsnes.hpp"
 
+#include "cmdhelp/moviedata.hpp"
 #include "core/advdumper.hpp"
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
@@ -46,8 +47,13 @@ namespace
 			return mprefix + "-";
 	}
 
-	command::fnptr<const std::string&> CMD_dump_coresave(lsnes_cmds, "dump-coresave", "Dump bsnes core state",
-		"Syntax: dump-coresave <name>\nDumps core save to <name>\n",
+	command::fnptr<const std::string&> test4(lsnes_cmds, CMOVIEDATA::panic,
+		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
+		auto& core = CORE();
+		if(*core.mlogic) emerg_save_movie(core.mlogic->get_mfile(), core.mlogic->get_rrdata());
+	});
+
+	command::fnptr<const std::string&> CMD_dump_coresave(lsnes_cmds, CMOVIEDATA::dumpcore,
 		[](const std::string& name) throw(std::bad_alloc, std::runtime_error) {
 			auto& core = CORE();
 			auto x = core.rom->save_core_state();
diff --git a/src/core/multitrack.cpp b/src/core/multitrack.cpp
index 9c871a95..4786b86e 100644
--- a/src/core/multitrack.cpp
+++ b/src/core/multitrack.cpp
@@ -15,9 +15,9 @@ multitrack_edit::multitrack_edit(movie_logic& _mlogic, controller_state& _contro
 	status_updater& _supdater, button_mapping& _buttons, command::group& _cmd)
 	: mlogic(_mlogic), controls(_controls), edispatch(_dispatch), supdater(_supdater), buttons(_buttons),
 	cmd(_cmd),
-	mt_f(cmd, STUBS::multitrackf, [this]() { this->do_mt_fwd(); }),
-	mt_b(cmd, STUBS::multitrackb, [this]() { this->do_mt_bw(); }),
-	mt_s(cmd, STUBS::multitracks, [this](const std::string& a) { this->do_mt_set(a); })
+	mt_f(cmd, CMULTITRACK::f, [this]() { this->do_mt_fwd(); }),
+	mt_b(cmd, CMULTITRACK::b, [this]() { this->do_mt_bw(); }),
+	mt_s(cmd, CMULTITRACK::s, [this](const std::string& a) { this->do_mt_set(a); })
 {
 }
 
diff --git a/src/core/project.cpp b/src/core/project.cpp
index 24894b25..7406768e 100644
--- a/src/core/project.cpp
+++ b/src/core/project.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/lua.hpp"
 #include "cmdhelp/project.hpp"
 #include "core/command.hpp"
 #include "core/controller.hpp"
@@ -195,12 +196,12 @@ project_state::project_state(voice_commentary& _commentary, memwatch_set& _mwatc
 	emulator_dispatch& _edispatch, input_queue& _iqueue, loaded_rom& _rom, status_updater& _supdater)
 	: commentary(_commentary), mwatch(_mwatch), command(_command), controls(_controls), setcache(_setcache),
 	buttons(_buttons), edispatch(_edispatch), iqueue(_iqueue), rom(_rom), supdater(_supdater),
-	branch_ls(command, STUBS::branch_ls, [this]() { this->do_branch_ls(); }),
-	branch_mk(command, STUBS::branch_mk, [this](const std::string& a) { this->do_branch_mk(a); }),
-	branch_rm(command, STUBS::branch_rm, [this](const std::string& a) { this->do_branch_rm(a); }),
-	branch_set(command, STUBS::branch_set, [this](const std::string& a) { this->do_branch_set(a); }),
-	branch_rp(command, STUBS::branch_rp, [this](const std::string& a) { this->do_branch_rp(a); }),
-	branch_mv(command, STUBS::branch_mv, [this](const std::string& a) { this->do_branch_mv(a); })
+	branch_ls(command, CPROJECT::bls, [this]() { this->do_branch_ls(); }),
+	branch_mk(command, CPROJECT::bmk, [this](const std::string& a) { this->do_branch_mk(a); }),
+	branch_rm(command, CPROJECT::brm, [this](const std::string& a) { this->do_branch_rm(a); }),
+	branch_set(command, CPROJECT::bset, [this](const std::string& a) { this->do_branch_set(a); }),
+	branch_rp(command, CPROJECT::brp, [this](const std::string& a) { this->do_branch_rp(a); }),
+	branch_mv(command, CPROJECT::bmv, [this](const std::string& a) { this->do_branch_mv(a); })
 {
 	active_project = NULL;
 }
@@ -407,9 +408,9 @@ skip_rom_movie:
 				messages << "Can't set/clear watch '" << i << "': " << e.what() << std::endl;
 			}
 		commentary.load_collection(p->directory + "/" + p->prefix + ".lsvs");
-		command.invoke("reset-lua");
+		command.invoke(CLUA::reset.name);
 		for(auto i : p->luascripts)
-			command.invoke("run-lua " + i);
+			command.invoke(CLUA::run.name + (" " + i));
 		buttons.load(controls, *active_project);
 	} catch(std::exception& e) {
 		if(newmovie && !used)
diff --git a/src/core/queue.cpp b/src/core/queue.cpp
index f0e159e5..f1026614 100644
--- a/src/core/queue.cpp
+++ b/src/core/queue.cpp
@@ -48,7 +48,14 @@ void input_queue::queue(const keypress_info& k) throw(std::bad_alloc)
 void input_queue::queue(const std::string& c) throw(std::bad_alloc)
 {
 	threads::alock h(queue_lock);
-	commands.push_back(c);
+	commands.push_back(std::make_pair(nullptr, c));
+	queue_condition.notify_all();
+}
+
+void input_queue::queue(const char* c, const std::string& a) throw(std::bad_alloc)
+{
+	threads::alock h(queue_lock);
+	commands.push_back(std::make_pair(c, a));
 	queue_condition.notify_all();
 }
 
@@ -96,10 +103,13 @@ void input_queue::run_queue(bool unlocked) throw()
 		}
 		//Flush commands.
 		while(!commands.empty()) {
-			std::string c = commands.front();
+			auto c = commands.front();
 			commands.pop_front();
 			queue_lock.unlock();
-			command.invoke(c);
+			if(c.first)
+				command.invoke(c.first, c.second);
+			else
+				command.invoke(c.second);
 			queue_lock.lock();
 			queue_function_run = true;
 		}
diff --git a/src/core/subtitles.cpp b/src/core/subtitles.cpp
index ee4bce4f..7ff6b6cb 100644
--- a/src/core/subtitles.cpp
+++ b/src/core/subtitles.cpp
@@ -105,9 +105,9 @@ namespace
 subtitle_commentary::subtitle_commentary(movie_logic& _mlogic, emu_framebuffer& _fbuf, emulator_dispatch& _dispatch,
 	command::group& _cmd)
 	: mlogic(_mlogic), fbuf(_fbuf), edispatch(_dispatch), cmd(_cmd),
-	editsub(cmd, STUBS::editsub, [this](const std::string& a) { this->do_editsub(a); }),
-	listsub(cmd, STUBS::listsub, [this]() { this->do_listsub(); }),
-	savesub(cmd, STUBS::savesub, [this](command::arg_filename a) { this->do_savesub(a); })
+	editsub(cmd, CSUBTITLE::edit, [this](const std::string& a) { this->do_editsub(a); }),
+	listsub(cmd, CSUBTITLE::list, [this]() { this->do_listsub(); }),
+	savesub(cmd, CSUBTITLE::save, [this](command::arg_filename a) { this->do_savesub(a); })
 {
 }
 
diff --git a/src/core/ui-services.cpp b/src/core/ui-services.cpp
index 0265bd09..c9a4ec4b 100644
--- a/src/core/ui-services.cpp
+++ b/src/core/ui-services.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/lua.hpp"
 #include "core/advdumper.hpp"
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
@@ -175,7 +176,7 @@ void UI_save_author_info(emulator_instance& inst, project_author_info& info)
 		if(proj && info.autorunlua)
 			for(auto i : info.luascripts)
 				if(!oldscripts.count(i))
-					inst.command->invoke("run-lua " + i);
+					inst.command->invoke(CLUA::run.name, i);
 	});
 }
 
diff --git a/src/core/window.cpp b/src/core/window.cpp
index 11906b1a..7083f523 100644
--- a/src/core/window.cpp
+++ b/src/core/window.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/sound.hpp"
 #include "core/audioapi.hpp"
 #include "core/audioapi-driver.hpp"
 #include "core/command.hpp"
@@ -39,16 +40,14 @@ volatile bool platform::do_exit_dummy_event_loop = false;
 
 namespace
 {
-	command::fnptr<> identify_key(lsnes_cmds, "show-plugins", "Show plugins in use",
-		"Syntax: show-plugins\nShows plugins in use.\n",
+	command::fnptr<> identify_key(lsnes_cmds, CSOUND::showdrv,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			messages << "Graphics:\t" << graphics_driver_name() << std::endl;
 			messages << "Sound:\t" << audioapi_driver_name() << std::endl;
 			messages << "Joystick:\t" << joystick_driver_name() << std::endl;
 		});
 
-	command::fnptr<const std::string&> enable_sound(lsnes_cmds, "enable-sound", "Enable/Disable sound",
-		"Syntax: enable-sound <on/off/toggle>\nEnable or disable sound.\n",
+	command::fnptr<const std::string&> enable_sound(lsnes_cmds, CSOUND::enable,
 		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
 			if(args == "toggle") {
 				if(!audioapi_driver_initialized())
@@ -90,9 +89,7 @@ namespace
 			return true;
 	}
 
-	command::fnptr<const std::string&> change_playback_dev(lsnes_cmds, "change-playback-device",
-		"Change sound playback device",
-		"Syntax: change-playback-device <device>\nSwitch to playback device <device>.\n",
+	command::fnptr<const std::string&> change_playback_dev(lsnes_cmds, CSOUND::chpdev,
 		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
 			auto old_rec = audioapi_driver_get_device(true);
 			auto args2 = args;
@@ -103,9 +100,7 @@ namespace
 			platform::set_sound_device(args2, old_rec);
 		});
 
-	command::fnptr<const std::string&> change_record_dev(lsnes_cmds, "change-record-device",
-		"Change sound record device",
-		"Syntax: change-record-device <device>\nSwitch to recording device <device>.\n",
+	command::fnptr<const std::string&> change_record_dev(lsnes_cmds, CSOUND::chrdev,
 		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
 			auto old_play = audioapi_driver_get_device(false);
 			auto args2 = args;
@@ -116,8 +111,7 @@ namespace
 			platform::set_sound_device(old_play, args2);
 		});
 
-	command::fnptr<> show_devices(lsnes_cmds, "show-devices", "Show sound devices available",
-		"Syntax: show-devices\nShows available sound devices.\n",
+	command::fnptr<> show_devices(lsnes_cmds, CSOUND::showdev,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			messages << "Known playback devices:" << std::endl;
 			auto pdevs = audioapi_driver_get_devices(false);
@@ -135,8 +129,7 @@ namespace
 			}
 		});
 
-	command::fnptr<> reset_audio(lsnes_cmds, "reset-audio", "Reset audio driver",
-		"Syntax: reset-audio\nResets the audio driver.\n",
+	command::fnptr<> reset_audio(lsnes_cmds, CSOUND::reset,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 			//Save the old devices. We save descriptions if possible, since handles change.
 			auto cpdev = platform::get_sound_device_description(false);
@@ -151,10 +144,6 @@ namespace
 			platform::set_sound_device_by_description(cpdev, crdev);
 		});
 
-	keyboard::invbind_info ienable_sound(lsnes_invbinds, "enable-sound on", "Sound‣Enable");
-	keyboard::invbind_info idisable_sound(lsnes_invbinds, "enable-sound off", "Sound‣Disable");
-	keyboard::invbind_info itoggle_sound(lsnes_invbinds, "enable-sound toggle", "Sound‣Toggle");
-
 	class window_output
 	{
 	public:
diff --git a/src/library/command.cpp b/src/library/command.cpp
index 9cb9328c..5182c7a7 100644
--- a/src/library/command.cpp
+++ b/src/library/command.cpp
@@ -303,26 +303,47 @@ not_alias:
 			size_t split = cmd2.find_first_of(" \t");
 			std::string rcmd = cmd2.substr(0, min(split, cmd2.length()));
 			std::string args = cmd2.substr(min(cmd2.find_first_not_of(" \t", split), cmd2.length()));
+			invoke(rcmd, args);
+			return;
+		} catch(std::bad_alloc& e) {
+			oom_panic_routine();
+		} catch(std::exception& e) {
+			(*output) << "Error[" << cmd2 << "]: " << e.what() << std::endl;
+			command_stack.erase(cmd2);
+			return;
+		}
+	} catch(std::bad_alloc& e) {
+		oom_panic_routine();
+	}
+}
+
+void group::invoke(const std::string& cmd, const std::string& args) throw()
+{
+	auto state = group_internal_t::get_soft(this);
+	if(!state) return;
+	try {
+		std::string ckey = cmd + " " + args;
+		try {
 			base* cmdh = NULL;
 			{
 				threads::arlock lock(get_cmd_lock());
-				if(!state->commands.count(rcmd)) {
-					(*output) << "Unknown command '" << rcmd << "'" << std::endl;
+				if(!state->commands.count(cmd)) {
+					(*output) << "Unknown command '" << cmd << "'" << std::endl;
 					return;
 				}
-				cmdh = state->commands[rcmd];
+				cmdh = state->commands[cmd];
 			}
-			if(command_stack.count(cmd2))
+			if(command_stack.count(ckey))
 				throw std::runtime_error("Recursive command invocation");
-			command_stack.insert(cmd2);
+			command_stack.insert(ckey);
 			cmdh->invoke(args);
-			command_stack.erase(cmd2);
+			command_stack.erase(ckey);
 			return;
 		} catch(std::bad_alloc& e) {
 			oom_panic_routine();
 		} catch(std::exception& e) {
-			(*output) << "Error[" << cmd2 << "]: " << e.what() << std::endl;
-			command_stack.erase(cmd2);
+			(*output) << "Error[" << ckey << "]: " << e.what() << std::endl;
+			command_stack.erase(ckey);
 			return;
 		}
 	} catch(std::bad_alloc& e) {
diff --git a/src/lua/lua.cpp b/src/lua/lua.cpp
index eb072db2..59e86518 100644
--- a/src/lua/lua.cpp
+++ b/src/lua/lua.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/lua.hpp"
 #include "core/command.hpp"
 #include "library/globalwrap.hpp"
 #include "library/keyboard.hpp"
@@ -155,7 +156,11 @@ namespace
 }
 
 lua_state::lua_state(lua::state& _L, command::group& _command)
-	: L(_L), command(_command)
+	: L(_L), command(_command),
+	resetcmd(command, CLUA::reset, [this]() { this->do_reset(); }),
+	evalcmd(command, CLUA::eval, [this](const std::string& a) { this->do_eval_lua(a); }),
+	evalcmd2(command, CLUA::eval2, [this](const std::string& a) { this->do_eval_lua(a); }),
+	runcmd(command, CLUA::run, [this](command::arg_filename a) { this->do_run_lua(a); })
 {
 	requests_repaint = false;
 	requests_subframe_paint = false;
@@ -341,49 +346,27 @@ bool lua_state::callback_do_button(uint32_t port, uint32_t controller, uint32_t
 
 namespace
 {
-	command::fnptr<const std::string&> CMD_evaluate_lua(lsnes_cmds, "evaluate-lua", "Evaluate expression in "
-		"Lua VM", "Syntax: evaluate-lua <expression>\nEvaluates <expression> in Lua VM.\n",
-		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
-			if(args == "")
-				throw std::runtime_error("Expected expression to evaluate");
-			auto& core = CORE();
-			core.lua2->do_eval_lua(args);
-		});
-
-	command::fnptr<const std::string&> CMD_evaluate_lua2(lsnes_cmds, "L", "Evaluate expression in "
-		"Lua VM", "Syntax: evaluate-lua <expression>\nEvaluates <expression> in Lua VM.\n",
-		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
-			if(args == "")
-				throw std::runtime_error("Expected expression to evaluate");
-			auto& core = CORE();
-			core.lua2->do_eval_lua(args);
-		});
-
-	command::fnptr<command::arg_filename> CMD_run_lua(lsnes_cmds, "run-lua", "Run Lua script in Lua VM",
-		"Syntax: run-lua <file>\nRuns <file> in Lua VM.\n",
-		[](command::arg_filename args) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto& core = CORE();
-			core.lua2->do_run_lua(args);
-		});
-
-	command::fnptr<> CMD_reset_lua(lsnes_cmds, "reset-lua", "Reset the Lua VM",
-		"Syntax: reset-lua\nReset the Lua VM.\n",
-		[]() throw(std::bad_alloc, std::runtime_error)
-		{
-			auto& core = CORE();
-			core.lua->reset();
-			luaL_openlibs(core.lua->handle());
-
-			core.lua2->run_sysrc_lua(true);
-			copy_system_tables(*core.lua);
-			messages << "Lua VM reset" << std::endl;
-		});
-
 	lua::_class<lua_unsaferewind> LUA_class_unsaferewind(lua_class_movie, "UNSAFEREWIND", {}, {
 	}, &lua_unsaferewind::print);
 }
 
+void lua_state::do_reset()
+{
+	L.reset();
+	luaL_openlibs(L.handle());
+	
+	run_sysrc_lua(true);
+	copy_system_tables(L);
+	messages << "Lua VM reset" << std::endl;
+}
+
+void lua_state::do_evaluate(const std::string& a)
+{
+	if(a == "")
+		throw std::runtime_error("Expected expression to evaluate");
+	do_eval_lua(a);
+}
+
 void lua_state::callback_quit() throw()
 {
 	run_callback(*on_quit);
diff --git a/src/lua/memory.cpp b/src/lua/memory.cpp
index d9cef2f0..833f609c 100644
--- a/src/lua/memory.cpp
+++ b/src/lua/memory.cpp
@@ -1,3 +1,4 @@
+#include "cmdhelp/lua.hpp"
 #include "core/command.hpp"
 #include "core/debug.hpp"
 #include "core/instance.hpp"
@@ -467,7 +468,7 @@ namespace
 		}
 	}
 
-	command::fnptr<> CMD_callbacks_show_lua(lsnes_cmds, "show-lua-callbacks", "", "",
+	command::fnptr<> CMD_callbacks_show_lua(lsnes_cmds, CLUA::scb,
 		[]() throw(std::bad_alloc, std::runtime_error) {
 		auto& core = CORE();
 		lua::state& L = *core.lua;
diff --git a/src/platform/libao/sound.cpp b/src/platform/libao/sound.cpp
index 66726172..e3609064 100644
--- a/src/platform/libao/sound.cpp
+++ b/src/platform/libao/sound.cpp
@@ -1,5 +1,6 @@
 #include "lsnes.hpp"
 
+#include "cmdhelp/libao-sound.hpp"
 #include "core/audioapi-driver.hpp"
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
@@ -115,7 +116,7 @@ namespace
 		return true;
 	}
 
-	command::fnptr<const std::string&> x(lsnes_cmds, "libao-set-id", "", "",
+	command::fnptr<const std::string&> x(lsnes_cmds, CLIBAOSND::setid,
 		[](const std::string& value) throw(std::bad_alloc, std::runtime_error) {
 			driver_id = parse_value<int>(value);
 		});
diff --git a/src/platform/wxwidgets/mainwindow.cpp b/src/platform/wxwidgets/mainwindow.cpp
index a9d55350..5c992b67 100644
--- a/src/platform/wxwidgets/mainwindow.cpp
+++ b/src/platform/wxwidgets/mainwindow.cpp
@@ -14,6 +14,10 @@
 #include "platform/wxwidgets/menu_branches.hpp"
 #include "platform/wxwidgets/menu_projects.hpp"
 
+#include "cmdhelp/framebuffer.hpp"
+#include "cmdhelp/loadsave.hpp"
+#include "cmdhelp/lua.hpp"
+#include "cmdhelp/subtitles.hpp"
 #include "core/audioapi.hpp"
 #include "core/audioapi-driver.hpp"
 #include "core/command.hpp"
@@ -245,7 +249,7 @@ namespace
 					show_message_ok(w, "Error downloading movie", old->errormsg,
 						wxICON_EXCLAMATION);
 				} else {
-					inst.iqueue->queue("load-movie $MEMORY:wxwidgets_download_tmp");
+					inst.iqueue->queue(CLOADSAVE::ldm.name, "$MEMORY:wxwidgets_download_tmp");
 				}
 				delete old;
 				Stop();
@@ -554,12 +558,12 @@ namespace
 
 	void recent_movie_selected(emulator_instance& inst, const recentfiles::path& file)
 	{
-		inst.iqueue->queue("load-smart " + file.get_path());
+		inst.iqueue->queue(CLOADSAVE::ldsm.name, file.get_path());
 	}
 
 	void recent_script_selected(emulator_instance& inst, const recentfiles::path& file)
 	{
-		inst.iqueue->queue("run-lua " + file.get_path());
+		inst.iqueue->queue(CLUA::run.name, file.get_path());
 	}
 
 	wxString getname(emulator_instance& inst)
@@ -690,7 +694,7 @@ namespace
 					romload_request req;
 					req.packfile = a;
 					load_new_rom(req);
-					CORE().command->invoke("load-smart " + b);
+					CORE().command->invoke(CLOADSAVE::ldsm.name, b);
 				}, [](std::exception& e) {});
 				ret = true;
 			}
@@ -698,7 +702,7 @@ namespace
 				std::string a = tostdstring(filenames[0]);
 				bool amov = is_lsnes_movie(a);
 				if(amov) {
-					inst.iqueue->queue("load-smart " + a);
+					inst.iqueue->queue(CLOADSAVE::ldsm.name, a);
 					pwin->recent_movies->add(a);
 					ret = true;
 				} else {
@@ -1446,7 +1450,7 @@ void wxwin_mainwindow::handle_menu_click_cancelable(wxCommandEvent& e)
 		filename = choose_file_load(this, "Load Movie", UI_get_project_moviepath(inst),
 			filetype_movie).second;
 		recent_movies->add(filename);
-		inst.iqueue->queue("load-movie " + filename);
+		inst.iqueue->queue(CLOADSAVE::ldm.name, filename);
 		return;
 	case wxID_LOAD_STATE:
 		filename2 = choose_file_load(this, "Load State", UI_get_project_moviepath(inst),
@@ -1464,7 +1468,7 @@ void wxwin_mainwindow::handle_menu_click_cancelable(wxCommandEvent& e)
 		inst.iqueue->queue("save-movie" + filename2.first + " " + filename2.second);
 		return;
 	case wxID_SAVE_SUBTITLES:
-		inst.iqueue->queue("save-subtitle " + choose_file_save(this, "Save subtitles",
+		inst.iqueue->queue(CSUBTITLE::save.name, choose_file_save(this, "Save subtitles",
 			UI_get_project_moviepath(inst), filetype_sub, project_prefixname(inst, "sub")));
 		return;
 	case wxID_SAVE_STATE:
@@ -1474,26 +1478,25 @@ void wxwin_mainwindow::handle_menu_click_cancelable(wxCommandEvent& e)
 		inst.iqueue->queue("save-state" + filename2.first + " " + filename2.second);
 		return;
 	case wxID_SAVE_SCREENSHOT:
-		inst.iqueue->queue("take-screenshot " + choose_file_save(this, "Save Screenshot",
+		inst.iqueue->queue(CFRAMEBUF::ss.name, choose_file_save(this, "Save Screenshot",
 			UI_get_project_moviepath(inst), filetype_png, get_default_screenshot_name(inst)));
 		return;
 	case wxID_RUN_SCRIPT:
-		inst.iqueue->queue("run-script " + pick_file_member(this, "Select Script",
+		inst.iqueue->queue(CLUA::run.name, pick_file_member(this, "Select Script",
 			UI_get_project_otherpath(inst)));
 		return;
 	case wxID_RUN_LUA: {
 		std::string f = choose_file_load(this, "Select Lua Script", UI_get_project_otherpath(inst),
 			filetype_lua_script);
-		inst.iqueue->queue("run-lua " + f);
+		inst.iqueue->queue(CLUA::run.name, f);
 		recent_scripts->add(f);
 		return;
 	}
 	case wxID_RESET_LUA:
-		inst.iqueue->queue("reset-lua");
+		inst.iqueue->queue(CLUA::reset.name);
 		return;
 	case wxID_EVAL_LUA:
-		inst.iqueue->queue("evaluate-lua " + pick_text(this, "Evaluate Lua",
-			"Enter Lua Statement:"));
+		inst.iqueue->queue(CLUA::eval.name, pick_text(this, "Evaluate Lua", "Enter Lua Statement:"));
 		return;
 	case wxID_READONLY_MODE:
 		s = menu_ischecked(wxID_READONLY_MODE);
-- 
2.11.4.GIT