Cleaned up code in ParseWrapper/ZoneInfoWrapper