Further minor style changes.