A few (hopefully last) changes suggested by Peter.