Merge "Tidy-up changes to time zone classes"