which.c tokenizer improved