Internal changes to improve speed.