Improve handling of event time.