Expand <command> to include grammar for each unique command