Update after Stephane Seyvoz's review.