@@ -48,14 +48,14 @@
     OFSerialization>
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # define ObjectType id
 #endif
 {
-	of_list_object_t *_firstListObject;
-	of_list_object_t *_lastListObject;
-	size_t		 _count;
-	unsigned long	 _mutations;
+	of_list_object_t *_Nullable _firstListObject;
+	of_list_object_t *_Nullable _lastListObject;
+	size_t _count;
+	unsigned long  _mutations;
 }
 
 /*!
  * The first list object of the list.
  */
@@ -182,16 +182,16 @@
 #endif
 @end
 
 @interface OFListEnumerator: OFEnumerator
 {
-	OFList		 *_list;
-	of_list_object_t *_current;
-	unsigned long	 _mutations;
-	unsigned long	 *_mutationsPtr;
+	OFList *_list;
+	of_list_object_t *_Nullable _current;
+	unsigned long _mutations;
+	unsigned long *_Nullable _mutationsPtr;
 }
 
 -     initWithList: (OFList *)list
   mutationsPointer: (unsigned long *)mutationsPtr;
 @end
 
 OF_ASSUME_NONNULL_END