grammar tweaks
small grammar cleanups
add optional leading pipe
New syntax grammar now compiles equivalent

to old syntax.