During work on #1392 quite a few mismatches were repaired when noticed, but a more diligent resync (scripted? to CI?) is desirable.