Work around cmd/command requirements

In lieu of upcoming fix and refactor.