Merging this as it changes the max line length to 88.
Even though the schedule is not completely fixed.