Fix breakage due to event-related renames in Base.