The calls to count_segs appear very different from each other, but
this is really just because of line wrapping (enforced by the
clang-format linter). This patch produces equivalent code but the
results are far easier to read.

Change-Id: I9d548a4988d4ef23f71fbd8afc855eb8a43f7bd5