Allow diff tool to run in-jvm multiple times, and resolve some conflicting shading