Rewrote some productions to remove conflicts