Adjustment for GrammarParser split

- additional bugfixes after the last restructuring