Two fixes:

1. Further disambiguate alarms for events that might be at the same time
2. Process recurrence records to reschedule repeats of a base event