Make swap event handling match the spec