Case 3459 - Code style fixes.