Migrate usages of s.t.n.u.TreeSet to s.c.m.TreeSet