In addition to (hopefully) making clear what's going on
we now do the additional preprocessing for all the versions of haddock 
(but not for hscolour) and we run cpp before moving the files.