Some minor cleanup

lib/puma/client.rb

@@ -51,6 +51,8 @@ def close
       @io.close
     end
 
+    # The object used for a request with no body. All requests with
+    # no body share this one object since it has no state.
     EmptyBody = NullIO.new
 
     def setup_body

lib/puma/reactor.rb

@@ -2,8 +2,9 @@ module Puma
   class Reactor
     DefaultSleepFor = 5
 
-    def initialize(events, app_pool)
-      @events = events
+    def initialize(server, app_pool)
+      @server = server
+      @events = server.events
       @app_pool = app_pool
 
       @mutex = Mutex.new
@@ -35,7 +36,7 @@ def run
                 end
               # The client doesn't know HTTP well
               rescue HttpParserError => e
-                @events.parse_error self, c.env, e
+                @events.parse_error @server, c.env, e
 
               rescue EOFError
                 c.close

lib/puma/server.rb

@@ -374,10 +374,6 @@ def normalize_env(env, client)
       env[REMOTE_ADDR] = client.peeraddr.last
     end
 
-    # The object used for a request with no body. All requests with
-    # no body share this one object since it has no state.
-    EmptyBody = NullIO.new
-
     # Given the request +env+ from +client+ and a partial request body
     # in +body+, finish reading the body if there is one and invoke
     # the rack app. Then construct the response and write it back to