get_tok_str is called in several places with second parameter NULL,
though inside members (thus dereferencing NULL) is possible.
Probably this combination "bad" never happens, but would like to use this
function to understand the code.
No problem to fix on my side, but I am doing some similar minor fixes,
and find it pity not to commit upstream.
Can you please tell me your rules for git push/branches etc.?