Merge styling fixes to master.