More clean-up in API.