Bug 901377: fix serious autocorrect regressions