haddock tweaks, lens 3.8 compat(?)