Small changes after remarks from Boudewijn.