Normalize selectors more.