straightforward refactor PR for any one who would like to review: https://github.com/pantsbuild/pants/pull/20944