Fix cl command runner for the new DSL spec.
Fix Command instantiations, since it now has one more argument