Whitespace.
80-col violations.
Remove duplication between D.S.Haddock and D.C.Haddock.

See #1233.