Looks like some event handling changes here... is this (and the code below) needed for this patch or is it left over from #23?