diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index ce5ecf648..a5092aa53 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -9830,10 +9830,7 @@ static int16_t whitelinescan(int16_t sucksect, int16_t dalinehighlight)
         wall[i].point2 = i+1;
     wall[tnewnumwalls-1].point2 = numwalls;
 
-    if (clockdir(numwalls) == CLOCKDIR_CCW)
-        return(-1);
-    else
-        return(tnewnumwalls);
+    return (clockdir(numwalls) == CLOCKDIR_CCW) ? -1 : tnewnumwalls;
 }
 
 int32_t loadnames(const char *namesfile, int8_t root)
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 2f80a3cbe..73eaad87c 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -446,7 +446,9 @@ void yax_setbunch(int16_t i, int16_t cf, int16_t bunchnum)
 
 #if !defined NEW_MAP_FORMAT
         *(&sector[i].ceilingstat + cf) &= ~YAX_BIT;
-        YAX_BUNCHNUM(i, cf) = 0;
+        // NOTE: Don't reset xpanning-as-index, since we can be called from
+        // e.g. Mapster32's "Inner loop made into new sector" functionality.
+//        YAX_BUNCHNUM(i, cf) = 0;
 #else
         YAX_BUNCHNUM(i, cf) = -1;
 #endif
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index 84deea677..85edba8d5 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -2203,7 +2203,6 @@ local handle =
     end,
 
     -- <fmt>: format string, number of %s's must match number of varargs
-    -- <umask>: number, if 2^i is set, arg '%i' must not be a system gamearray
     arraycmd = function(fmt, dstargi, ...)
         local args = {...}
         if (issysgar(args[dstargi])) then