Extending this hack recovers a regression in a previously-fixed compiler crasher (#26725), and fixes two more compiler crashers. So, despite it's utter lack of principle, it's progress.
