Added XPathAmender to amend xpaths when necessary. Changed DefVar to accept multiple xpaths.