[69] First step of making automatic patches applying somewhat smarter.