Slightly less painful event handling