Modified CFGrammar constructor parameter order
Resolved merge conflicts