@@ -54,28 +54,11 @@
 - (instancetype)initWithRange: (OFRange)range
 {
 	return (id)[[OFRangeCharacterSet alloc] initWithRange: range];
 }
 
-- (instancetype)retain
-{
-	return self;
-}
-
-- (instancetype)autorelease
-{
-	return self;
-}
-
-- (void)release
-{
-}
-
-- (void)dealloc
-{
-	OF_DEALLOC_UNSUPPORTED
-}
+OF_SINGLETON_METHODS
 @end
 
 @implementation OFCharacterSet
 + (void)initialize
 {
@@ -148,29 +131,10 @@
 	    initWithCharacterSet: self] autorelease];
 }
 @end
 
 @implementation OFWhitespaceCharacterSet
-- (instancetype)autorelease
-{
-	return self;
-}
-
-- (instancetype)retain
-{
-	return self;
-}
-
-- (void)release
-{
-}
-
-- (unsigned int)retainCount
-{
-	return OFMaxRetainCount;
-}
-
 - (bool)characterIsMember: (OFUnichar)character
 {
 	switch (character) {
 	case 0x0009:
 	case 0x0020:
@@ -193,6 +157,8 @@
 		return true;
 	default:
 		return false;
 	}
 }
+
+OF_SINGLETON_METHODS
 @end