diff --git a/mapeffects.cpp b/mapeffects.cpp
index ec56fb01..248bac1e 100644
--- a/mapeffects.cpp
+++ b/mapeffects.cpp
@@ -757,9 +757,9 @@ EX void checkTide(cell *c) {
 EX bool makeNoMonster(cell *c) {
   changes.ccell(c);
   if(isAnyIvy(c->monst)) killMonster(c, moPlayer, 0);
-  else if(c->monst == moPair) {
+  else if(is_paired(c->monst)) {
     changes.ccell(c->move(c->mondir));
-    if(c->move(c->mondir)->monst == moPair)
+    if(is_paired(c->move(c->mondir)->monst))
       c->move(c->mondir)->monst = moNone;
     }
   else if(isWorm(c->monst)) {
diff --git a/orbs.cpp b/orbs.cpp
index 9f713072..0664775e 100644
--- a/orbs.cpp
+++ b/orbs.cpp
@@ -1171,9 +1171,9 @@ void poly_attack(cell *dest) {
   dest->monst = target;
   if(!dest->stuntime) dest->stuntime = 1;
 
-  if(among(orig, moPair, moSouthPole, moNorthPole)) {
+  if(is_paired(orig)) {
     cell *dest2 = dest->move(dest->mondir);
-    if(dest2->monst == moPair) {
+    if(is_paired(dest2->monst)) {
       dest2->monst = dest->monst;
       if(!dest2->stuntime) dest2->stuntime = 1;
       }
diff --git a/savemem.cpp b/savemem.cpp
index 101bc115..f99eb9aa 100644
--- a/savemem.cpp
+++ b/savemem.cpp
@@ -25,7 +25,7 @@ EX void destroycellcontents(cell *c) {
   c->land = laMemory;
   c->wall = waChasm;
   c->item = itNone;
-  if(!isMultitile(c->monst) && c->monst != moPair)
+  if(!isMultitile(c->monst) && !is_paired(c->monst))
     c->monst = moNone;
   }