Style and 80-column fixes.