fix up event target, unwrap callbacks in event listeners