Oil rises as threat of immediate Iran supply recedes