--- toast	2005/09/06 03:40:29	1.398
+++ toast	2005/09/06 06:42:44	1.399
@@ -2636,18 +2636,13 @@
 $0 =~ m!([^/]+)$! or die;
 my($me) = $1;
 
-my(@extra);
 my($wrap) = $ENV{"TOAST_HS_WRAPPER"} || "";
-if($wrap)
-{
-  $wrap .= ":";
-}
-else
-{
-  push(@extra, ($me =~ /-pkg/ ? "-" : "") . "-package-conf", $_)
-      for grep(-r, split(/:/, $ENV{"GHC_PKG_PATH"} || ""));
-}
+$wrap .= ":" if $wrap;
 $ENV{"TOAST_HS_WRAPPER"} = $wrap .= $0;
+
+my(@extra);
+push(@extra, ($me =~ /-pkg/ ? "-" : "") . "-package-conf", $_)
+    for grep(-r, split(/:/, $ENV{"GHC_PKG_PATH"} || ""));
 
 DIR: for(split(/:/, $ENV{"PATH"}))
 {