@@ -217,11 +217,12 @@
 + (void)callAllDestructors
 {
 	of_list_object_t *iter;
 
 	@synchronized (tlskeys) {
-		for (iter = [tlskeys first]; iter != NULL; iter = iter->next)
+		for (iter = [tlskeys firstListObject]; iter != NULL;
+		    iter = iter->next)
 			((OFTLSKey*)iter->object)->destructor(iter->object);
 	}
 }
 
 - init
@@ -236,11 +237,11 @@
 
 	destructor = NULL;
 
 	@synchronized (tlskeys) {
 		@try {
-			listobj = [tlskeys append: self];
+			listobj = [tlskeys appendObject: self];
 		} @catch (OFException *e) {
 			/*
 			 * We can't use [super dealloc] on OS X here.
 			 * Compiler bug? Anyway, [self dealloc] will do here
 			 * as we check listobj != NULL in dealloc.
@@ -271,11 +272,11 @@
 	of_tlskey_free(key);
 
 	@synchronized (tlskeys) {
 		/* In case we called [self dealloc] in init */
 		if (listobj != NULL)
-			[tlskeys remove: listobj];
+			[tlskeys removeListObject: listobj];
 	}
 
 	[super dealloc];
 }
 @end