Fix xvalver.