Update after Hannes' review.