Tokenizer function cleanup. Multiple return, control flow identical.