Add blocks, generic spans to grammar.