Added haddock commentary.