Rework XRun handling.