Here is the version of this patch that I ended up checking in.

-- 
Joel