Cleanups while promoting 2.39 to branch.