Cosmetic changes into the API.