More care with time types