swift234

Sema: Re-arrange deck chairs again

Another pre-emptive compiler_crasher regression fix.

I have an idea for consolidating some of these hacky circularity
checks in a nice way, but not now.