haddock: maintainer anders -> john