Being more careful with selectors.