Some style-related fixes.