PS: sorry I don't have the toolsuite to provide a context diff  
tonight, but given the size of the patch I figured I'd send it anyway.  
Will cook a context diff tomorrow if needed, it's running late here.  
Oh, we're already tomorrow, even.