Revised grammar with new pegex syntax