Update type_index, variant from master.