Address comments from 01db53dac620db87801642c688c90b43f3d8832e.