Tweak the haddock rules; no functional change