A slow move towards a more self-consistent API.