[cvs-nhc98] Some preparation towards getting Cygwin/ghc builds working