Integrate some comments of Géraud and all of Cezary.