I left these untouched from the original Rake tasks, since the methods were untested in the first place. I would merge it and fix it up, personally, since I think the patch needs to get used in anger - and this keeps the surface area minimal.