100% haddock for public API again.