Replace the do-while loop with a Rust style infinite loop
Improves the formatting of the peg
Improves string literals in the grammar