Refactored grammar. No reduce/reduce conflicts. 22 shift/reduce conflicts.