Last week I spent a some more time on my security manager patch (https://github.com/pantsbuild/pants/pull/6203) for the junit runner. One of the things I did was extract some of the code movement that wasn’t directly related to the change. https://github.com/pantsbuild/pants/pull/6860