Add selector expansion method, finish check for disjoint selectors, toss unused isdisjoint_interval method.