Further coding style fixes.