I've attached a couple of patches contributed by Josh Sinykin.

-- 
Bruce