Refactored event time parsing, part 2/?