Make sure some event handlers get unhooked properly (Issue #70)