Several style fixes.