Make the API a lot more consistent.