Oh right, I see what you've done now, which looks reasonable, but I'll comment elsewhere. Though the comment still needs removing.