It looks like all the other changes are moot (or at least, I think I've answered all the related questions) -- assuming no one raises any other issues and this is the last thing, do you think you could just add this to your 'style cleanup' patch (along with the NaN -vs- 0/0 thing below, depending on who wins it)?