Refactor to avoid strict warnings when overwrite request/response inject...

...ion