Minor cleanups
Minor cleanups found while implementing modules_commands.json
support. Split out to simplify that topic.
Edited by Brad King
Minor cleanups found while implementing modules_commands.json
support. Split out to simplify that topic.