A few small changes for cosmetics.