3c501: Further coding style fixes