Adding more verbosity in dump_tokens