Improve how list comprehensions are formatted.

Make splitting dependent upon whether the "comp_for" or "comp_if" goes over the
column limit.
5 files changed