Hmm. You're going to step on Gideon's toes with any changes you make here. He's in the middle of refactoring and patching the rsync stuff.