Fix whitespace and 80-column violations.