Made the grammar fully peg

Still need to simplify, and actually test.
Removed `Opt` rules, replacing with ?

PEG has no need to do a ` | Empty` rule, since it supports the
optional operator from regular expressions, `?`. There's probably
still a lot more than can be simplified with PEG.