Reduce diagnostics

Simplify things in the parser by reducing hte number of places where we explicitly create diagnostics.  There are now only two places where we make diagnostics. Missing tokens and extra tokens.