Simplified grammar.  Node type tweak.

Removed unnecessary type tags from grammar.  Changed grammar to use Node
pointers instead of values, so we can make String() a pointer method
and make munging trees more easily later on.