diff --git a/lib/modules/ADT.pmod/Queue.pike b/lib/modules/ADT.pmod/Queue.pike
index a44137ac7260b16e3c1b5f0aa8e3ec8e60d184d0..218446570cdf74f1770bd432c2c0102a5c27c9d3 100644
--- a/lib/modules/ADT.pmod/Queue.pike
+++ b/lib/modules/ADT.pmod/Queue.pike
@@ -1,4 +1,4 @@
-/* $Id: Queue.pike,v 1.4 2001/11/22 20:00:58 nilsson Exp $
+/* $Id: Queue.pike,v 1.5 2002/02/14 17:20:20 nilsson Exp $
  *
  * A simple FIFO queue. 
  */
@@ -55,7 +55,7 @@ mixed get()
 //  werror(sprintf("Queue->get: %O\n", l[tail..head-1]));
   mixed res;
   if (tail == head)
-    return ([])[0];
+    return UNDEFINED;
   res = l[tail];
   l[tail++] = 0;
   return res;
diff --git a/lib/modules/Calendar.pmod/Event.pmod b/lib/modules/Calendar.pmod/Event.pmod
index ba877ed3a19ae720959f3c6980f2b3656cfc37bc..46a8fbec055ed38fe0c2737b28826c1911015861 100644
--- a/lib/modules/Calendar.pmod/Event.pmod
+++ b/lib/modules/Calendar.pmod/Event.pmod
@@ -351,8 +351,8 @@ class Namedays
 	    [y,yjd,leap]=gregorian_yjd(jd);
 	    if (y<leapdayshift) ld=55-1; // 24 feb
 	    else ld=60-1;        // 29 feb
-	    if (last_year!=-1 && y>last_year) return ([])[0];
-	    if (first_year!=-1 && y<first_year) return ([])[0];
+	    if (last_year!=-1 && y>last_year) return UNDEFINED;
+	    if (first_year!=-1 && y<first_year) return UNDEFINED;
 	 }
 
 	 array(string) n;
@@ -451,7 +451,7 @@ class SuperNamedays
       array(TimeRange) a=map(namedayss,"next",from,including)-({0});
       switch (sizeof(a))
       {
-	 case 0: return ([])[0];
+	 case 0: return UNDEFINED;
 	 case 1: return a[0];
 	 default: return min(@a);
       }
@@ -462,7 +462,7 @@ class SuperNamedays
       array(TimeRange) a=map(namedayss,"previous",from,including)-({0});
       switch (sizeof(a))
       {
-	 case 0: return ([])[0];
+	 case 0: return UNDEFINED;
 	 case 1: return a[0];
 	 default: return max(@a);
       }
@@ -1105,7 +1105,7 @@ class SuperEvent
    mapping(Event:multiset(string)) flags=([]);
 
    array(Event) events=({});
-   mapping(string:Event) id2event=([])[0];
+   mapping(string:Event) id2event=UNDEFINED;
 
    array(Event) day_events=({});
    array(Namedays) namedays=({});
diff --git a/lib/modules/Calendar.pmod/Events.pmod b/lib/modules/Calendar.pmod/Events.pmod
index e481d23da4c9492dffe37237571001a0fb5673d0..9e2f176e1bf044697ac7ad61df8eaf56f9b6e0cb 100644
--- a/lib/modules/Calendar.pmod/Events.pmod
+++ b/lib/modules/Calendar.pmod/Events.pmod
@@ -184,7 +184,7 @@ Event.Namedays find_namedays(string region)
    string all=read_all_namedays();
 
    int i=search(all,"\nRegion \""+region+"\"");
-   if (i==-1) return ([])[0]; // not found
+   if (i==-1) return UNDEFINED; // not found
 
    int i2=search(all,"\nRegion",i+1);
    if (i2==-1) i2=strlen(all)-1;
@@ -279,7 +279,7 @@ Event.Event find_event(string s)
       return find_namedays(s[9..]);
 
    int i=search(all_data,sprintf("Event %O",s));
-   if (i==-1) return ([])[0];
+   if (i==-1) return UNDEFINED;
    
    int j=search(all_data,"\n",i);
    if (j==-1) j=0x7fffffff;
@@ -294,7 +294,7 @@ Event.Event find_region(string c)
    if (!all_data) read_all_data();
 
    int i=search(all_data,sprintf("\nRegion %O",c));
-   if (i==-1) return ([])[0];
+   if (i==-1) return UNDEFINED;
    
    int j=search(all_data,"\nRegion \"",i+1);
    if (j==-1) j=0x7fffffff;
@@ -394,7 +394,7 @@ Event.Event|Event.Namedays magic_event(string s)
    if (s=="tzshift") 
       return loaded_events->tzshift=Event.TZShift_Event();
 
-   return ([])[0];
+   return UNDEFINED;
 }
 
 Event.SuperEvent country(string s)
diff --git a/lib/modules/Calendar.pmod/Language.pmod b/lib/modules/Calendar.pmod/Language.pmod
index b7a9904579b0c8e50c21e41f22e9031771b91743..6eb7e815426c914df459b5f1a89e85ef50f3b933 100644
--- a/lib/modules/Calendar.pmod/Language.pmod
+++ b/lib/modules/Calendar.pmod/Language.pmod
@@ -2025,7 +2025,7 @@ Ruleset.Language `[](string lang)
    if (!cl && sscanf(lang,"%S_UNICODE",lang))
        cl=::`[]("c"+lang);
 
-   if (!cl) { return ([])[0]; }
+   if (!cl) { return UNDEFINED; }
 
    l=_cache[lang]=cl();
    
diff --git a/lib/modules/Calendar.pmod/Timezone.pmod b/lib/modules/Calendar.pmod/Timezone.pmod
index 3cb8d2263cccdd3e1c800533fe5ce54b0c38b33d..d7eaca2067a8dbd2dfd0009f5ffb485b992d8e1e 100644
--- a/lib/modules/Calendar.pmod/Timezone.pmod
+++ b/lib/modules/Calendar.pmod/Timezone.pmod
@@ -259,7 +259,7 @@ class Timezone_Encapsule
 static private Ruleset.Timezone _make_new_timezone_i(string tz,int plusminus)
 {
    object(Ruleset.Timezone) z=`[](tz);
-   if (!z) return ([])[0];
+   if (!z) return UNDEFINED;
    return make_new_timezone(z,plusminus);
 }
 
@@ -1069,7 +1069,7 @@ class Runtime_timezone_compiler
       werror("Searching for zone %O\n",s);
 #endif
       if (zone_cache[s]) return zone_cache[s];
-      if (s=="") return ([])[0];
+      if (s=="") return UNDEFINED;
 
       if (!all_rules) all_rules=get_all_rules();
 
@@ -1087,7 +1087,7 @@ class Runtime_timezone_compiler
 	 werror("hit at: %O\n",n);
 #endif
 	 if (n==-1) 
-	    return ([])[0];
+	    return UNDEFINED;
 	 int i=max(n-100,0)-1,j;
 	 do i=search(all_rules,"\nZone",(j=i)+1); while (i<n && i!=-1);
 
@@ -1179,7 +1179,7 @@ class Runtime_timezone_compiler
 	 werror("hit at: %O\n",n);
 #endif
 	 if (n==-1) 
-	    return ([])[0];
+	    return UNDEFINED;
 
 	 int i=max(n-100,0)-1,j;
 	 do i=search(all_rules,"\nRule",(j=i)+1); while (i<n && i!=-1);
diff --git a/lib/modules/Calendar.pmod/module.pmod b/lib/modules/Calendar.pmod/module.pmod
index 5237ae0b58b77df346f4cefe73ac4f9c76130825..657d602802483633ed3d6ee1cdac9c95809bd946 100644
--- a/lib/modules/Calendar.pmod/module.pmod
+++ b/lib/modules/Calendar.pmod/module.pmod
@@ -50,7 +50,7 @@ mixed `[](string what)
       else
 	 default_rules->timezone=tz; // destructive!
    }
-   if ( !magic[what] || (stage && what!="default_rules")) return ([])[0];
+   if ( !magic[what] || (stage && what!="default_rules")) return UNDEFINED;
    switch (what)
    {
       case "ISO_UTC":
diff --git a/lib/modules/GDK.pmod b/lib/modules/GDK.pmod
index d6fa1bb51490a7ac418273c8f820c52d21c18aec..81067f444df65359b48a525815f9513852606eda 100644
--- a/lib/modules/GDK.pmod
+++ b/lib/modules/GDK.pmod
@@ -37,7 +37,7 @@ object Atom = class
 
 mixed `[](string what)
 {
-  if(what == "_module_value") return ([])[0];
+  if(what == "_module_value") return UNDEFINED;
   if(what == "Atom") return Atom;
   if(!zero_type(INDEX("Gdk"+what)))
     return INDEX("Gdk"+what);
@@ -45,7 +45,7 @@ mixed `[](string what)
     return INDEX("GDK_"+what);
   if(!zero_type(INDEX("GDK_"+upper_case(GTK->unsillycaps(what)))))
     return INDEX("GDK_"+upper_case(GTK->unsillycaps(what)));
-  return ([])[0];
+  return UNDEFINED;
 //   return  GDKSupport[what];
 }
 
diff --git a/lib/modules/Gnome.pmod b/lib/modules/Gnome.pmod
index f136876b963948a4a96b1069e845a4566c4c98e0..cac28d1df671f75543456ab07c3f9cb5033ebb7b 100644
--- a/lib/modules/Gnome.pmod
+++ b/lib/modules/Gnome.pmod
@@ -4,7 +4,7 @@
 
 mixed `[](string what)
 {
-  if(what == "_module_value") return ([])[0];
+  if(what == "_module_value") return UNDEFINED;
   return (GTK["Gnome"+what] || GTK["gnome_"+what]);
 }
 
diff --git a/lib/modules/Remote.pmod/connection.pike b/lib/modules/Remote.pmod/connection.pike
index e8a00f327a28e0d1021e19e0d6ea57f48e165351..92ad3c19b66631e27570a221d6a53b1542dfa7e5 100644
--- a/lib/modules/Remote.pmod/connection.pike
+++ b/lib/modules/Remote.pmod/connection.pike
@@ -544,7 +544,7 @@ mixed call_sync(array data)
     if (!nice)
       error("Could not read");
     else
-      return ([])[0];
+      return UNDEFINED;
   }
   return get_result(refno);
 }