Update from tzcode1998g.