(See rationale in patch 2/3) Scripting catches handles almost all the instances, but isn't able to handle a few exceptional cases which are handled in patches 1 and 3. When committed, the three patches will be squashed together so that there is no intermediate breakage.
Matt
