Fixed overly broad event clustering. Re: #854