refine the previous change

This time eliminate a few instances of the code initializing struct tok
with negative values and squelch the warnings like below:

warning: initializer will be sign-extended: -1