@@ -78,10 +78,12 @@
 
 @interface OFMapTableValueEnumerator: OFMapTableEnumerator
 @end
 
 @implementation OFMapTable
+@synthesize keyFunctions = _keyFunctions, valueFunctions = _valueFunctions;
+
 + (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions
 			  valueFunctions: (of_map_table_functions_t)
 					      valueFunctions
 {
 	return [[[self alloc]
@@ -664,20 +666,10 @@
 			}
 		}
 	}
 }
 #endif
-
-- (of_map_table_functions_t)keyFunctions
-{
-	return _keyFunctions;
-}
-
-- (of_map_table_functions_t)valueFunctions
-{
-	return _valueFunctions;
-}
 @end
 
 @implementation OFMapTableEnumerator
 - init
 {