More sensible API.