Update wantlib from shadchin@