Fix handling of Static XML DS's. RE: #1618
Tracking latest JIT