A bit more API clean up.