Commit after discussion with Benoît.