Further style fixes.