Yes, they might be useful somewhere else too, but the EFI
discovery code is so fragile that it's not worth the bother.

EFI people informed.