Style fixes, no functional changes.