The Ethics of War and Peace Revisited