More tweaks to the API.