The patch below seems to fix this problem.

John, do you remember why you had those let-bindings (which originally
were let-binding `after-change-functions` to nil)?


        Stefan