More http.rb fixups