Further changes for kernel coding standards.