Tweaks while reviewing event-related classes.