Improving the Assessment of the Proliferation Risk of Nuclear Fuel Cycles