Minor private API changes.