AFAIK, the tests that care about 100%-never-see-a-tombstone-in-the-keydir aren't using expiry, and the expiry tests don't yet care.  So I think that we agree that it doesn't matter.