diff --git a/core/MessageBuffer.st b/core/MessageBuffer.st
index c42ffb0..197ed76 100644
--- a/core/MessageBuffer.st
+++ b/core/MessageBuffer.st
@@ -24,9 +24,7 @@ Collection subclass: MessageBuffer [
 
     MessageBuffer class >> new [
         <category: 'creation'>
-        ^ (super new)
-            initialize;
-            yourself
+        ^self basicNew initialize
     ]
 
     initialize [
diff --git a/core/TLV.st b/core/TLV.st
index f15b29f..db71100 100644
--- a/core/TLV.st
+++ b/core/TLV.st
@@ -64,9 +64,7 @@ Object subclass: TLVDescription [
 
         new [
             <category: 'creation'>
-            ^ super basicNew
-                initialize;
-                yourself
+            ^self basicNew initialize
         ]
     ]
 
diff --git a/ipa/IPADispatcher.st b/ipa/IPADispatcher.st
index cfe918a..209c4d0 100644
--- a/ipa/IPADispatcher.st
+++ b/ipa/IPADispatcher.st
@@ -24,9 +24,7 @@ Object subclass: IPADispatcher [
 
     IPADispatcher class >> new [
         <category: 'creation'>
-        ^ super new
-            initialize;
-            yourself
+        ^self basicNew initialize
     ]
 
     initialize [
diff --git a/isup/generator/create_structs.st b/isup/generator/create_structs.st
index 0178d0c..e4c6904 100644
--- a/isup/generator/create_structs.st
+++ b/isup/generator/create_structs.st
@@ -107,8 +107,7 @@ Object subclass: StructCreator [
     ]
 
     StructCreator class >> new [
-        ^ super new
-            initialize
+        ^self basicNew initialize
     ]
 
     initialize [
diff --git a/m2ua/M2UAApplicationServerProcess.st b/m2ua/M2UAApplicationServerProcess.st
index e9fb1aa..3ee21df 100644
--- a/m2ua/M2UAApplicationServerProcess.st
+++ b/m2ua/M2UAApplicationServerProcess.st
@@ -39,9 +39,7 @@ a single ASP to send one ASPActive for one interface at a time.'>
     ]
 
     M2UAApplicationServerProcess class >> new [
-	^super new
-	    initialize;
-	    yourself
+	^self basicNew initialize
     ]
 
     onError: aBlock [
diff --git a/m2ua/M2UAAspStateMachine.st b/m2ua/M2UAAspStateMachine.st
index 0e495e6..fcb3a48 100644
--- a/m2ua/M2UAAspStateMachine.st
+++ b/m2ua/M2UAAspStateMachine.st
@@ -34,9 +34,7 @@ This class is currently not used!'>
     ]
 
     M2UAAspStateMachine class >> new [
-	^(self basicNew)
-	    initialize;
-	    yourself
+	^self basicNew initialize
     ]
 
     entered: aState [
diff --git a/osmo/OsmoUDPSocket.st b/osmo/OsmoUDPSocket.st
index 7dafddc..d1bded3 100644
--- a/osmo/OsmoUDPSocket.st
+++ b/osmo/OsmoUDPSocket.st
@@ -24,9 +24,7 @@ Object subclass: OsmoUDPSocket [
 
     OsmoUDPSocket class >> new [
         <category: 'creation'>
-        ^ super new
-            initialize;
-            yourself
+        ^self basicNew initialize
     ]
 
     initialize [