The patch I supplied is of course wrong: it did the same "blind replace"
refactoring and got it wrong (skitts law in programming), the attached
patch is uglier but hopefully is semantically correct --Madhu