Rework selectors (for efficiency?).