Don't add null grammar options
Merge branch 'testrig-lexer-from-tokenvocab' into develop