More code style fixes.