diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 94c4b1a0..da7f7f8b 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -88,17 +88,8 @@ module Jekyll
         end
       end
 
-      self.converters = Jekyll::Converter.subclasses.select do |c|
-        !self.safe || c.safe
-      end.map do |c|
-        c.new(self.config)
-      end
-
-      self.generators = Jekyll::Generator.subclasses.select do |c|
-        !self.safe || c.safe
-      end.map do |c|
-        c.new(self.config)
-      end
+      self.converters = instantiate_subclasses(Jekyll::Converter)
+      self.generators = instantiate_subclasses(Jekyll::Generator)
     end
 
     # Internal: Setup the plugin search path
@@ -388,6 +379,21 @@ module Jekyll
       end
     end
 
+    # Create array of instances of the subclasses of the class or module
+    #   passed in as argument.
+    #
+    # klass - class or module containing the subclasses which should be
+    #         instantiated
+    #
+    # Returns array of instances of subclasses of parameter
+    def instantiate_subclasses(klass)
+      klass.subclasses.select do |c|
+        !self.safe || c.safe
+      end.map do |c|
+        c.new(self.config)
+      end
+    end
+
     # Read the entries from a particular directory for processing
     #
     # dir - The String relative path of the directory to read