--- rpl/modules/motif/XtRemoveCallback.rplc	2017/07/17 21:35:32	1.1
+++ rpl/modules/motif/XtRemoveCallback.rplc	2017/07/30 21:59:41	1.2
@@ -40,8 +40,8 @@ declareExternalFunction(XtRemoveCallback
 			repeatWhile(not nullified(current))
 				callbackFromList = fetchElementFromDaisyChain(current);
 
-				if ((((sXtCallback *) objectContainer(callbackFromList))->widget
-						eq target((Widget *) objectContainer(widget))) and
+				if (((objectContainer(sXtCallback, callbackFromList))->widget
+						eq target(objectContainer(Widget, widget))) and
 						(callback eq callbackFromList)) then
 					break;
 				endIf