Fix how service events lookup its classes.