A few more style changes.