parser regen with the latest grammar-kit, part 2