Sure, I'd accept that. Want to move `TimeZoneId` at the same time?