Update from tzcode1999a.