Slight consolidation in BoolSelector class