Shift to using unwrap() so event handlers and private data are not lost