Internal changes. No functional change intended.