At this late stage I don't think it's worth us making any changes here. It looks like the same applies to XFRM too.
Only XF1 is affected.
A tool to rebuild and remove orphaned records isn't planned either, though you can make a suggestion thread if you feel it is significant and we can consider it in the future.