The desired improvements can be found in #26052.