Proper event XML handling (bug 901099)