Cleanup; add escaping functions to HTTP.Util