Clean up API a bit.