Did the Supreme Leader Just Torpedo the Nuclear Talks?

Iran’s Supreme Leader, Ali Khamenei, made a speech last night to mark Ramadan, and to make a stand a few days before the June 30 deadline for completing a final, comprehensive deal with world powers on his country’s nuclear programme.
Khamenei framed the issue in terms of Iranian defiance in the face of an American-led campaign to destroy the country’s nuclear programme and thereby hobble Iran as a regional power. But he also went into detail, setting down apparent red lines on what Iran would accept. What has drawn attention is that his remarks seem to contradict parts of the provisional outline deal clinched in Lausanne at the beginning of April, as a waystation to a comprehensive agreement due to be finalised on Tuesday.