clean up the Haddock rules a bit