Minor fixes in GrammarBuilder