Add back the CLI grammar that was left out during the file rename a few commits back