I think we should spend the time instead of fixing auto-detection of EFI. I'm sure you made bug-reports for that.