A little more with the API coding style.