Merge "Tokenization code cleanup." into experimental