Merge "Fix XML early-outs."