Replacing use of net/http.Request with internal Request wrapper