Util: XWrapper delay-init fixes.