More work on expiry garbage collection