Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Extract out simplification changes #40948
Pulling out independent parts of #40746 to make that PR simpler.
This PR should be reviewed with whitespace off.