> P.S. I don't mean to sound too negative. Feel free to merge it, but I'd rather do so only with better proof to back the change - lacking that, I'd rather keep the code simple.

+1