I did a pull request against your branch with a change to this API.  I didn't change the stuff that calls it though, that still needs to be done.