Additional style fixes.