--- cf.schmorp.de/server/common/map.C	2007/05/18 00:09:16	1.104
+++ cf.schmorp.de/server/common/map.C	2007/05/28 05:35:51	1.105
@@ -672,9 +672,9 @@
 {
   for (;;)
     {
-      keyword kw = thawer.get_kv ();
+      thawer.next ();
 
-      switch (kw)
+      switch (thawer.kw)
         {
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);