A few more minor style changes.