o Some more style-guide changes.