Make `diff` function more liberal
Add years function