Semi-fixed grammar with fewer conflicts

Fixed #3