Move timestamp generation to the same place as the other s.* variables are set