Final xpath tweak.