More work for removing SwiftHTTP dependencies