Small API changes.