Initial changes based on discussion with Benoît.