More 80 character fixes.