Improved support for repeated events.