More coding standard improvements.