I like this patch. It seems to do the right thing, although it'll be necessary to check with jcstress and perhaps write a few more jcstress test cases to make sure that the right thing happens in all cases. Andrew.