Corrected most of the remaining 'style warnings'.