[BUG #8613] simplify and consolidate events (use emit only)