Factored out bucket-spec in syntax diagrams.