Adapt grammar to allow type params/args like <? extends T[]>