Should we remove the `COMMAND` from the short usage string?