darcs patch: avoid import renaming errors in nhc98 (and 2 more)