better reuse of common code in CLIs

[propensive]

There is currently far too much copy/pasted code in the various CLI objects. There is an opportunity to reduce this significantly by refactoring out several lines of the for-comprehensions into separate, composable methods.