Ah, but perhaps you've already covered that because any fields whose dots are dominated by the context clock will still be removed.