Progress on moving to xpath.