More work on getting token types.