Once again, changed tokenKind.expand() to not use local variables, and i...

...nstead declare memory on the heap.