Various style fixes.