Send both cmd and args to the catch-all command handler

Can you make this {cmd: cmd, args: args} since the current template expects a named field called 'cmd'?