Fix diff on unchanged

[cincodenada]

This fixes #355 and is just #356 rebased against current main. It was a pretty straightforward rebase, just required updating the class names manually.