[selectors] Address anne's comments.