@@ -17,11 +17,11 @@
 
 #include <errno.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFSPXStreamSocket";
+static OFString *const module = @"OFSPXStreamSocket";
 
 @interface SPXStreamSocketDelegate: OFObject <OFSPXStreamSocketDelegate>
 {
 @public
 	OFStreamSocket *_expectedServerSocket;
@@ -37,11 +37,11 @@
 @implementation SPXStreamSocketDelegate
 -    (bool)socket: (OFStreamSocket *)sock
   didAcceptSocket: (OFStreamSocket *)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);
@@ -71,12 +71,12 @@
 @implementation TestsAppDelegate (OFSPXStreamSocketTests)
 - (void)SPXStreamSocketTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSPXStreamSocket *sockClient, *sockServer, *sockAccepted;;
-	of_socket_address_t address1;
-	const of_socket_address_t *address2;
+	OFSocketAddress address1;
+	const OFSocketAddress *address2;
 	unsigned char node[IPX_NODE_LEN], node2[IPX_NODE_LEN];
 	uint32_t network;
 	uint16_t port;
 	char buffer[5];
 	SPXStreamSocketDelegate *delegate;
@@ -88,25 +88,25 @@
 		TEST(@"-[bindToPort:]",
 		    R(address1 = [sockServer bindToPort: 0]))
 	} @catch (OFBindFailedException *e) {
 		switch (e.errNo) {
 		case EAFNOSUPPORT:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
-			    @"[OFSPXStreamSocket] -[bindToPort:]: "
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
+			    @"\r[OFSPXStreamSocket] -[bindToPort:]: "
 			    @"IPX unsupported, skipping tests"];
 			break;
 		case ESOCKTNOSUPPORT:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
-			    @"[OFSPXStreamSocket] -[bindToPort:]: "
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
+			    @"\r[OFSPXStreamSocket] -[bindToPort:]: "
 			    @"SPX unsupported, skipping tests"];
 			break;
 		case EADDRNOTAVAIL:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
-			    @"[OFSPXStreamSocket] -[bindToPort:]: "
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
+			    @"\r[OFSPXStreamSocket] -[bindToPort:]: "
 			    @"IPX not configured, skipping tests"];
 			break;
 		default:
 			@throw e;
 		}
@@ -113,41 +113,36 @@
 
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
-	of_socket_address_get_ipx_node(&address1, node);
-	network = of_socket_address_get_ipx_network(&address1);
-	port = of_socket_address_get_port(&address1);
+	OFSocketAddressIPXNode(&address1, node);
+	network = OFSocketAddressIPXNetwork(&address1);
+	port = OFSocketAddressPort(&address1);
 
 	TEST(@"-[listen]", R([sockServer listen]))
 
 	TEST(@"-[connectToNode:network:port:]",
-	    R([sockClient connectToNode: node
-				network: network
-				   port: port]))
+	    R([sockClient connectToNode: node network: network port: port]))
 
 	TEST(@"-[accept]", (sockAccepted = [sockServer accept]))
 
 	/* Test reassembly (this would not work with OFSPXSocket) */
 	TEST(@"-[writeBuffer:length:]",
-	    R([sockAccepted writeBuffer: "Hello"
-				 length: 5]))
+	    R([sockAccepted writeBuffer: "Hello" length: 5]))
 
 	TEST(@"-[readIntoBuffer:length:]",
-	    [sockClient readIntoBuffer: buffer
-				length: 2] == 2 &&
+	    [sockClient readIntoBuffer: buffer length: 2] == 2 &&
 	    memcmp(buffer, "He", 2) == 0 &&
-	    [sockClient readIntoBuffer: buffer
-				length: 3] == 3 &&
+	    [sockClient readIntoBuffer: buffer length: 3] == 3 &&
 	    memcmp(buffer, "llo", 3) == 0)
 
 	TEST(@"-[remoteAddress]",
 	    (address2 = sockAccepted.remoteAddress) &&
-	    R(of_socket_address_get_ipx_node(address2, node2)) &&
+	    R(OFSocketAddressIPXNode(address2, node2)) &&
 	    memcmp(node, node2, IPX_NODE_LEN) == 0 &&
-	    of_socket_address_get_ipx_network(address2) == network)
+	    OFSocketAddressIPXNetwork(address2) == network)
 
 	delegate = [[[SPXStreamSocketDelegate alloc] init] autorelease];
 
 	sockServer = [OFSPXStreamSocket socket];
 	delegate->_expectedServerSocket = sockServer;
@@ -159,15 +154,15 @@
 
 	address1 = [sockServer bindToPort: 0];
 	[sockServer listen];
 	[sockServer asyncAccept];
 
-	of_socket_address_get_ipx_node(&address1, node);
+	OFSocketAddressIPXNode(&address1, node);
 	memcpy(delegate->_expectedNode, node, IPX_NODE_LEN);
 	delegate->_expectedNetwork = network =
-	    of_socket_address_get_ipx_network(&address1);
-	delegate->_expectedPort = port = of_socket_address_get_port(&address1);
+	    OFSocketAddressIPXNetwork(&address1);
+	delegate->_expectedPort = port = OFSocketAddressPort(&address1);
 
 	@try {
 		[sockClient asyncConnectToNode: node
 				       network: network
 					  port: port];
@@ -178,13 +173,13 @@
 		TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]",
 		    delegate->_accepted && delegate->_connected)
 	} @catch (OFObserveFailedException *e) {
 		switch (e.errNo) {
 		case ENOTSOCK:
-			[of_stdout setForegroundColor: [OFColor lime]];
-			[of_stdout writeLine:
-			    @"[OFSPXStreamSocket] -[asyncAccept] & "
+			[OFStdOut setForegroundColor: [OFColor lime]];
+			[OFStdOut writeLine:
+			    @"\r[OFSPXStreamSocket] -[asyncAccept] & "
 			    @"-[asyncConnectToNode:network:port:]: select() "
 			    @"not supported for SPX, skipping test"];
 			break;
 		default:
 			@throw e;