More 100-col fixes.