Internal API changes.