Greatly reduced grammar conflicts in the parser