Changes the grammar to fix left recursion issue