sort token defs so they look neater.
Fix indent lexing sending erroneous tokens.