Nick Piggin wrote:

> Andrew and or Martin, please test attached patch.
> Thanks.
>

Well, one of the WARN conditions I put in there is clearly
redundant...