diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index 1d950963d..f441b1a8c 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -1001,7 +1001,7 @@ static Class	runLoopClass;
 
   l = [runLoopClass currentRunLoop];
 
-  IF_NO_GC([self retain];)
+  IF_NO_GC(RETAIN(self);)
 
   [l addEvent: (void*)(uintptr_t)desc
 	 type: ET_WDESC
@@ -1035,9 +1035,9 @@ static Class	runLoopClass;
       sent = YES;
     }
   M_UNLOCK(myLock);
-  DESTROY(self);
   NSDebugMLLog(@"NSMessagePort_details",
     @"Message send 0x%x on 0x%x status %d", components, self, sent);
+  RELEASE(self);
   return sent;
 }
 
@@ -1580,7 +1580,7 @@ typedef	struct {
 {
   if ([self isValid] == YES)
     {
-      IF_NO_GC([self retain];)
+      IF_NO_GC(RETAIN(self);)
       M_LOCK(myLock);
 
       if ([self isValid] == YES)
@@ -1612,7 +1612,7 @@ typedef	struct {
 	  [super invalidate];
 	}
       M_UNLOCK(myLock);
-      DESTROY(self);
+      RELEASE(self);
     }
 }
 
@@ -1715,7 +1715,7 @@ typedef	struct {
 
 - (void) removeHandle: (GSMessageHandle*)handle
 {
-  IF_NO_GC([self retain];)
+  IF_NO_GC(RETAIN(self);)
   M_LOCK(myLock);
   if ([handle sendPort] == self)
     {
@@ -1742,7 +1742,7 @@ typedef	struct {
       [self invalidate];
     }
   M_UNLOCK(myLock);
-  DESTROY(self);
+  RELEASE(self);
 }
 
 /*
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index 1d6421b30..9ecdec21a 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -1436,9 +1436,9 @@ static Class	runLoopClass;
       sent = YES;
     }
   M_UNLOCK(myLock);
-  DESTROY(self);
   NSDebugMLLog(@"GSTcpHandle",
     @"Message send 0x%x on 0x%x status %d", components, self, sent);
+  RELEASE(self);
   return sent;
 }
 
@@ -2100,7 +2100,7 @@ static Class		tcpPortClass;
 	  [super invalidate];
 	}
       M_UNLOCK(myLock);
-      DESTROY(self);
+      RELEASE(self);
     }
 }
 
@@ -2258,7 +2258,7 @@ static Class		tcpPortClass;
 	   * been retained - we must therefore release this port since the
 	   * handle no longer uses it.
 	   */
-	  DESTROY(self);
+	  IF_NO_GC(RELEASE(self);)
 	}
       handle->sendPort = nil;
     }
@@ -2275,7 +2275,7 @@ static Class		tcpPortClass;
       [self invalidate];
     }
   M_UNLOCK(myLock);
-  DESTROY(self);
+  RELEASE(self);
 }
 
 /*
diff --git a/Source/win32/NSMessagePort.m b/Source/win32/NSMessagePort.m
index f9f4a0482..87a6927c2 100644
--- a/Source/win32/NSMessagePort.m
+++ b/Source/win32/NSMessagePort.m
@@ -460,7 +460,7 @@ static Class		messagePortClass = 0;
 	}
       M_UNLOCK(this->lock);
     }
-  DESTROY(self);
+  RELEASE(self);
 }
 
 - (BOOL) isEqual: (id)anObject
@@ -917,7 +917,7 @@ again:
 				      forMode: mode
 					  all: YES];
     }
-  DESTROY(self);
+  RELEASE(self);
 }
 
 
@@ -1131,8 +1131,8 @@ again:
 	}
     }
   M_UNLOCK(this->lock);
-  DESTROY(self);
   RELEASE(h);
+  RELEASE(self);
 
   return sent;
 }