Cleaned up a bunch of things.
Even more HTTP lib cleanup.