Work on RFC5234 (but resultant grammar has recursion issues)
Fix alternation (thanks Andrei Neculau!) and CR; example tweaks