also pulled out the suggestions on https://github.com/pantsbuild/pants/pull/7171 into the PR comments and may attack that this weekend: https://pantsbuild.slack.com/archives/C0D7TNJHL/p1548678786134200?thread_ts=1548655292.133600&cid=C0D7TNJHL