Tokenizer: Use 'podtype' info from library. Partial fix for #5623