Thanks - another reason to move to UID-based APIs, I guess (and yes, I know that that is far from straightforward and someone would actually need to volunteer to do that)?