[SummerNSA] Split more long lines.