Fix the grammar ambiguity discussed in #7.  Adjust last example.

Also fix the definition of label and edge: they were using
notations from the patch proposed to support alternation.