@@ -45,21 +45,22 @@
  * @param key The current key
  * @param object The current object
  * @param stop A pointer to a variable that can be set to true to stop the
  *	       enumeration
  */
-typedef void (^of_map_table_enumeration_block_t)(void *key, void *object,
-    bool *stop);
+typedef void (^of_map_table_enumeration_block_t)(void *_Nullable key,
+    void *_Nullable object, bool *stop);
 
 /*!
  * @brief A block for replacing objects in an OFMapTable.
  *
  * @param key The key of the object to replace
  * @param object The object to replace
  * @return The object to replace the object with
  */
-typedef void *_Nonnull (^of_map_table_replace_block_t)(void *key, void *object);
+typedef void *_Nullable (^of_map_table_replace_block_t)(void *_Nullable key,
+    void *_Nullable object);
 #endif
 
 @class OFMapTableEnumerator;
 
 /*!
@@ -159,19 +160,19 @@
  * @brief Sets an object for a key.
  *
  * @param key The key to set
  * @param object The object to set the key to
  */
-- (void)setObject: (void *)object
-	   forKey: (void *)key;
+- (void)setObject: (nullable void *)object
+	   forKey: (nullable void *)key;
 
 /*!
  * @brief Removes the object for the specified key from the map table.
  *
  * @param key The key whose object should be removed
  */
-- (void)removeObjectForKey: (void *)key;
+- (void)removeObjectForKey: (nullable void *)key;
 
 /*!
  * @brief Removes all objects.
  */
 - (void)removeAllObjects;
@@ -246,19 +247,20 @@
 }
 
 - init OF_UNAVAILABLE;
 
 /*!
- * @brief Returns the next object.
+ * @brief Returns a pointer to the next object, or NULL if the enumeration
+ *	  finished.
  *
  * @return The next object
  */
-- (nullable void *)nextObject;
+- (void *_Nullable *_Nullable)nextObject;
 
 /*!
- * @brief Resets the enumerator, so the next call to @ref nextKey returns the
- *	  first key again.
+ * @brief Resets the enumerator, so the next call to @ref nextObject returns the
+ *	  first object again.
  */
 - (void)reset;
 @end
 
 OF_ASSUME_NONNULL_END