@@ -37,11 +37,11 @@
 @implementation SPXSocketDelegate
 -    (bool)socket: (OFSequencedPacketSocket *)sock
   didAcceptSocket: (OFSequencedPacketSocket *)accepted
 	exception: (id)exception
 {
-	OF_ENSURE(!_accepted);
+	OFEnsure(!_accepted);
 
 	_accepted = (sock == _expectedServerSocket && accepted != nil &&
 	    exception == nil);
 
 	if (_accepted && _connected)
@@ -54,11 +54,11 @@
   didConnectToNode: (unsigned char [IPX_NODE_LEN])node
 	   network: (uint32_t)network
 	      port: (uint16_t)port
 	 exception: (id)exception
 {
-	OF_ENSURE(!_connected);
+	OFEnsure(!_connected);
 
 	_connected = (sock == _expectedClientSocket &&
 	    memcmp(node, _expectedNode, IPX_NODE_LEN) == 0 &&
 	    network == _expectedNetwork && port == _expectedPort &&
 	    exception == nil);