Plug a memory leak where a struct tok_state was not being freed.

Also tweak a comparison that was going farther than needed.