https://github.com/Xazax-hun commented: I wish it was easier to see why this is an NFC, as in going in smaller steps but I trust @steakhal's review on that. Added some nits inline about naming and using more modern types. https://github.com/llvm/llvm-project/pull/210774