CMS-4491 Cleanup new command invoker.