Damn, I'm kind of ashamed that I haven't checked the final result myself. I assumed simonw checked it before posting and blindly went with it.