Barf. Looks like this was already implemented with 913c07a0499, but I failed to sync past that in my Git repo. I'll revisit if I find any differences worth submitting.
--ap