Fixes to CSTYLE.