[RFC] swap complete event handling fixes