Coding standard cleanup.