Re: [RFC] swap event handling fixes