Update tokenizer, disjoint_sets from master.