Wholesale simplification of selectors