@@ -50,14 +50,14 @@
 	if ((ivars = malloc(sizeof(*ivars))) == NULL)
 		@throw [OFOutOfMemoryException newWithClass: isa
 					      requestedSize: sizeof(*ivars)];
 	memset(ivars, 0, sizeof(*ivars));
 
-	ivars->string = (char*)s;
-	ivars->length = initialized;
+	ivars->cString = (char*)s;
+	ivars->cStringLength = initialized;
 
-	switch (of_string_check_utf8(ivars->string, ivars->length)) {
+	switch (of_string_check_utf8(ivars->cString, ivars->cStringLength)) {
 	case 1:
 		ivars->isUTF8 = YES;
 		break;
 	case -1:
 		free(ivars);
@@ -376,19 +376,10 @@
 		[self completeInitialization];
 
 	return [super compare: object];
 }
 
-/* From protocol OFSerialization */
-- (OFXMLElement*)XMLElementBySerializing
-{
-	if (initialized != SIZE_MAX)
-		[self completeInitialization];
-
-	return [super XMLElementBySerializing];
-}
-
 /* From OFObject, but reimplemented in OFString */
 - (BOOL)isEqual: (id)object
 {
 	if (initialized != SIZE_MAX)
 		[self completeInitialization];