Cleanup towards haddock.