Cleanups while promoting 2.38 to branch.