diff --git a/src/conf.py b/src/conf.py
index 6cee0c6fe..0addd3e81 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -171,12 +171,9 @@ for (name, s) in registry._cache.iteritems():
             registerNetwork(name)
 
 
-class SpaceSeparatedSetOfChannels(registry.SeparatedListOf):
+class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf):
     List = ircutils.IrcSet
     Value = ValidChannel
-    def splitter(self, s):
-        return s.split()
-    joiner = ' '.join
 
     def removeChannel(self, channel):
         removals = []
diff --git a/src/registry.py b/src/registry.py
index 148a73eaf..680f42a3a 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -444,11 +444,13 @@ class SeparatedListOf(Value):
             # config parser doesn't care about this space, we'll use it :)
             return ' ' 
         
-class SpaceSeparatedListOfStrings(SeparatedListOf):
-    Value = String
+class SpaceSeparatedListOf(SeparatedListOf):
     def splitter(self, s):
         return s.split()
     joiner = ' '.join
+    
+class SpaceSeparatedListOfStrings(SpaceSeparatedListOf):
+    Value = String
 
 class CommaSeparatedListOfStrings(SeparatedListOf):
     Value = String
@@ -456,9 +458,6 @@ class CommaSeparatedListOfStrings(SeparatedListOf):
         return re.split(r'\s*,\s*', s)
     joiner = ', '.join
     
-class CommaSeparatedSetOfStrings(CommaSeparatedListOfStrings):
-    List = sets.Set
-
 
 if __name__ == '__main__':
 #if 1: