Fix CallCommandRunner for the new DSL style
Workaround the cyclic import in lang, command and command_runners