More work in the path to a clean API nirvana.