Merge "Cleanup zoneinfo parsing function."