Require haddock-library >= 1.1 and simplify haddock reader code.

See #1346.