XPathConvertor: removed extraneous argument, moved some code around