Remove trailing whitespace and fix an 80-column violation. No functional change.