FLUID-5284: Some clean up of fastXMLPull