Oil rises as threat of immediate supply from Iran recedes