Added reverse mapping from kw name to token type.
Various cleanups to token structure and printing.