See if we can further simplify the resulting diff