Switch from a mutation loop to a generator in a make_idx path

Switch from a mutation loop to a generator in a make_idx path #419