diff --git a/celldrawer.cpp b/celldrawer.cpp
index 729a4702..9edec2e0 100644
--- a/celldrawer.cpp
+++ b/celldrawer.cpp
@@ -2397,7 +2397,7 @@ void celldrawer::add_map_effects() {
         }
       for(int u: {-1, 1}) {
         cellwalker cw = cellwalker(c, t) + wstep + u;
-        if(u == -1 && VALENCE == 4) continue;
+        if(u == -1 && valence() == 4) continue;
         cell *c2 = cw.peek();
         if(c2 && c2->ligon) {
           int lcol = darkena(gradient(iinf[itOrbLightning].color, 0, 0, tim, 1100), 0, 0xFF);
diff --git a/hyper.h b/hyper.h
index 4c944cb6..bcf5db58 100644
--- a/hyper.h
+++ b/hyper.h
@@ -196,11 +196,7 @@ void addMessage(string s, char spamtype = 0);
 #define STDVAR (PURE || BITRUNCATED)
 #define NONSTDVAR (!STDVAR)
 
-#if CAP_ARCM
-#define VALENCE (BITRUNCATED ? 3 : arcm::in() ? arcm::valence() : S3)
-#else
-#define VALENCE (BITRUNCATED ? 3 : S3)
-#endif
+#define VALENCE current_valence()
 
 #define NUMWITCH 7