[CLC-1133] Implementing fix for events beyond 'due next week', with fun refactoring