Ok, I've moved all the URL encoding work out of the `ClientFilter`.