I haven't checked that it looks right, but it is now accepted by haddock.