In b91c2673 I accidentally introduced fixes that were not necessary after 1a93285c. All but the `llvm_unreachable` are reverted again.