Clean up the HTTP subsystem a tiny bit