The Catholic presumption against war revisited