Next batch of changes to parser.  Much closer to working but still
giving an error at the end.