diff --git a/bigstuff.cpp b/bigstuff.cpp
index d61631db..ebf2ebc9 100644
--- a/bigstuff.cpp
+++ b/bigstuff.cpp
@@ -121,7 +121,7 @@ void generateAlts(heptagon *h, int levs, bool link_cdata) {
       break;
       }
     }
-  if(relspin == -4 && quotient != 2) {
+  if(relspin == -4 && geometry != gFieldQuotient) {
     if(h->alt != h->alt->alt) {
       printf("relspin {%p:%p}\n", h->alt, h->alt->alt);
       {for(int i=0; i<S7; i++) printf("%p ", h->alt->move[i]);} printf(" ALT\n");
diff --git a/cell.cpp b/cell.cpp
index 503d7e8f..46098b25 100644
--- a/cell.cpp
+++ b/cell.cpp
@@ -1469,7 +1469,7 @@ int celldistance(cell *c1, cell *c2) {
       return torusmap()->dists[torusconfig::vec_to_id(decodeId(c1->master)-decodeId(c2->master))];
     }
   
-  if(quotient == 2 && !gp::on)
+  if(geometry == gFieldQuotient && !gp::on)
     return currfp.getdist(fieldpattern::fieldval(c1), fieldpattern::fieldval(c2));
 
   if(sphere || quotient || torus) {
diff --git a/complex.cpp b/complex.cpp
index 36951080..71ee0ab5 100644
--- a/complex.cpp
+++ b/complex.cpp
@@ -2706,7 +2706,7 @@ namespace prairie {
       c->LHU.fi.rval = max(celldist(c), 15);
       }
     else {
-      if(quotient == 2 || !from) {
+      if(geometry == gFieldQuotient || !from) {
         c->fval = currfp.distflower0;
         }
       else if(from && from->land == laPrairie && from->fval)
diff --git a/fieldpattern.cpp b/fieldpattern.cpp
index 048b1766..28e44359 100644
--- a/fieldpattern.cpp
+++ b/fieldpattern.cpp
@@ -703,7 +703,7 @@ fpattern current_quotient_field(0), fp_invalid(0);
 bool quotient_field_changed;
 
 fpattern& getcurrfp() {
-  if(quotient == 2 && quotient_field_changed)
+  if(geometry == gFieldQuotient && quotient_field_changed)
     return current_quotient_field;  
   if(S7 == 8 && S3 == 3) {
     static fpattern fp(17);
diff --git a/geom-exp.cpp b/geom-exp.cpp
index c272b83d..900b65ba 100644
--- a/geom-exp.cpp
+++ b/geom-exp.cpp
@@ -376,7 +376,7 @@ void showEuclideanMenu() {
       dialog::addBoolItem(XLAT("stereographic/orthogonal"), vid.alpha>10, '1');
     else
       dialog::addBoolItem(XLAT("Poincaré/Klein"), vid.alpha>.5, '1');
-    if(torus || quotient == 2)
+    if(torus || geometry == gFieldQuotient)
       dialog::addItem(XLAT("advanced parameters"), '4');  
     dialog::addHelp();
     dialog::addBack();
@@ -423,7 +423,8 @@ void showEuclideanMenu() {
           torusconfig::newmode = torusconfig::torus_mode,
           torus_bitrunc = nonbitrunc,
           pushScreen(showTorusConfig);
-        if(quotient==2) pushScreen(showQuotientConfig);
+        if(geometry == gFieldQuotient) 
+          pushScreen(showQuotientConfig);
         }
       else if(doexiton(sym, uni))
         popScreen();