I have committed an extended version of the patch to the trunk. Please
review the new API to see if it works for you.

https://codespeak.net/viewvc/?view=rev&revision=70799