Squashed the event handler memory leak insurrection