Rename, but xpath memory leak remains.  Offending code in comments.