Remove old "Op" token group and fix stupid errors in parser.  Parser now
works for at least some inputs.