Reverts in part 9b1a88acf50cc31a
Reverts in part 9b1a88acf50cc31a

Because the code that generates indexes is terra incognita and changing the grammar declarator from one place to another leads to errors. Change related to #1912 remains in place.

tbrowder/doc,stmuk/doc,tbrowder/doc,jonathanstowe/doc,perl6/doc,perl6/doc,stmuk/doc,jonathanstowe/doc,perl6/doc,jonathanstowe/doc,dmaestro/doc,stmuk/doc,MasterDuke17/doc,MasterDuke17/doc,MasterDuke17/doc,perl6/doc,stmuk/doc,dmaestro/doc,MasterDuke17/doc,jonathanstowe/doc,dmaestro/doc,tbrowder/doc,jonathanstowe/doc,stmuk/doc,perl6/doc,dmaestro/doc,dmaestro/doc,tbrowder/doc