Change the CakeML grammar to be unambiguous (I hope).

Modify the PEG and ptreeConversion theories to adjust to this change,
and add another test-case as well.

I’d like to prove that the grammar is unambiguous: I think the key to
avoiding the case-of ambiguity comes from the fact that "|" is not in
E’s follow set.