+1. I just jumped in and did this one as 4dc8aa92a (will probably cause a merge conflict, sorry!)