Josh, Pavel,

I happen to have 3 patches in my tree that look like this one. I
thought you might
want to have a look as they appear to handle the points you were wanting to fix.
Patch 3 is a "documentation patch" that explains what I wanted to do.

I attached those patches as gmail does not allow me to answer a thread and
post a patch without losing its formatting.

hope it can help in a way or another.

-- 
Damien