Refactor time zone handling.