Minor haddock changes.