Merge "tokenize: quiet -Warray-bounds warnings"