[cvs-nhc98] Update to deal with package name differences in ghc-5.04.