String::Tokenize() cleanups, and regtest