Various miscellaneous touch-ups to the API.