XDR handling separated from withCredentials, fixed #35

Take a look before I merge it.
There's no such thing as too much peer review.
No, not yet ;)
 I'll make it less magical, but keep the logic.