I have made the commit now. I also included an update of XPathFilter so that it support extention functions. Makes xpath expressions more powerful if you can live with em being not standard. Hope that was ok.
Thanks to Peter and Jens Askengren for this valuable work,