Yet more style changes.