Fix a few usage and style-guide conformance issues.
1 file changed