More code-style fixes...