Clean up the public API a bit.