Tweaks suggested by Marie-Claire.