Fixes #20935 (closed) and #20924 (closed)
Also adds -Winvalid-haddock to the validate flavour.
-Winvalid-haddock