Back out earlier eager changes to reduce line length to < 80 by splitting at clauses.