I was on my way to write an extension like this myself. You saved me some work. :)