ENH: use the requests compat shim everywhere it is needed.