Fixing XML drama, take 2