Xoma, Novartis restructure vaccine agreement