--- rpl/modules/motif/types.rplc	2017/07/17 21:35:32	1.4
+++ rpl/modules/motif/types.rplc	2017/07/30 21:59:41	1.6
@@ -17,16 +17,16 @@ declareTypeExtension(dup)
 
 		initializeObject(nObject, oObject);
 
-		if (nullified(objectContainer(nObject) =
+		if (nullified(objectOf(nObject) =
 				malloc(sizeof(XtAppContext))))
 		{
 			typeSystemError;
 		}
 
-		target((sXtAppContext *) objectContainer(nObject)).widget =
-				target((sXtAppContext *) objectContainer(oObject)).widget;
-		target((sXtAppContext *) objectContainer(nObject)).context =
-				target((sXtAppContext *) objectContainer(oObject)).context;
+		target(objectContainer(sXtAppContext, nObject)).widget =
+				target(objectContainer(sXtAppContext, oObject)).widget;
+		target(objectContainer(sXtAppContext, nObject)).context =
+				target(objectContainer(sXtAppContext, oObject)).context;
 	}
 	else if (subType(oObject) == CALLBACK)
 	{
@@ -41,14 +41,14 @@ declareTypeExtension(dup)
 
 		initializeObject(nObject, oObject);
 
-		if (nullified(objectContainer(nObject) =
+		if (nullified(objectOf(nObject) =
 				malloc(sizeof(sXtAppContext))))
 		{
 			typeSystemError;
 		}
 
-		target((Widget *) objectContainer(nObject)) =
-				target((Widget *) objectContainer(oObject));
+		target(objectContainer(Widget, nObject)) =
+				target(objectContainer(Widget, oObject));
 	}
 	else
 	{
@@ -66,15 +66,15 @@ declareTypeExtension(drop)
 
 	if (subType(oObject) == APPCONTEXT)
 	{
-		free(objectContainer(oObject));
+		free(objectOf(oObject));
 	}
 	else if (subType(oObject) == CALLBACK)
 	{
-		free(objectContainer(oObject));
+		free(objectOf(oObject));
 	}
 	else if (subType(oObject) == WIDGET)
 	{
-		free(objectContainer(oObject));
+		free(objectOf(oObject));
 	}
 	else
 	{
@@ -99,7 +99,7 @@ declareTypeExtension(disp)
 		}
 
 		sprintf(s, "XtAppContext $ %016llX",
-				(long long unsigned int) objectContainer(oObject));
+				(long long unsigned int) objectOf(oObject));
 	}
 	else if (subType(oObject) == CALLBACK)
 	{
@@ -109,7 +109,7 @@ declareTypeExtension(disp)
 		}
 
 		sprintf(s, "Callback $ %016llX",
-				(long long unsigned int) objectContainer(oObject));
+				(long long unsigned int) objectOf(oObject));
 	}
 	else if (subType(oObject) == WIDGET)
 	{
@@ -119,7 +119,7 @@ declareTypeExtension(disp)
 		}
 
 		sprintf(s, "Widget $ %016llX",
-				(long long unsigned int) objectContainer(oObject));
+				(long long unsigned int) objectOf(oObject));
 	}
 	else
 	{