i'm sure that https://github.com/pantsbuild/pants/pull/4088 is going to make our lives harder. but he put a bunch of work into it, so i'm going to merge.