Cleaning up some of the API usage.