WIP: ResourceEvent-related refactorings