More minor style changes.