Some more coding rule violations corrected.

No match.