Add `COMMAND_{SHORT,LONG}`