Integrate comments from Géraud.