Re #8436. Refactored RangeSelector to prevent signal loops.